Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.

Commit 54fb842

Browse files
committed
Merge branch 'main' into solve-relaxed-using-primitives
2 parents 8d86e18 + 740e233 commit 54fb842

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

.github/workflows/test_development_versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
# Second, update requirements[-dev].txt in place to use the
3737
# development (git) versions of all Qiskit packages.
3838
sed -i 's|^\(qiskit[A-Za-z-]*\).*|git+https://github.com/Qiskit/\1.git|' requirements-dev.txt requirements.txt
39-
pip install tox
39+
pip install 'tox<4'
4040
- name: Modify tox.ini for more thorough check
4141
shell: bash
4242
run: |

.github/workflows/test_latest_versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install dependencies
3535
run: |
3636
python -m pip install --upgrade pip
37-
pip install tox
37+
pip install 'tox<4'
3838
- name: Modify tox.ini for more thorough check
3939
shell: bash
4040
run: |

NEWS.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
#### 0.2 (not yet released)
2+
3+
- 2022-11-23: The minimum required version of Qiskit is now 0.37.0,
4+
and the minimum required version of Qiskit Optimization is now
5+
0.4.0. Python 3.6 is no longer supported. ([#49])
6+
- 2022-11-23: The backend tests now use qiskit-ibm-provider rather
7+
than qiskit-ibmq-provider. ([#15])
8+
9+
#### 0.1 (2022-11-23)
10+
111
- 2022-06-21: Magic rounding now supports all available encodings.
212
([#33])
313
- 2022-06-17: Fixed a bug in the "weighted" sampling method for magic
@@ -12,7 +22,9 @@
1222
- 2022-06-09: Added a comparison to exact optimal function value using
1323
`CplexOptimizer` in the first tutorial ([#27])
1424

25+
[#15]: https://github.com/qiskit-community/prototype-qrao/pull/15
1526
[#27]: https://github.com/qiskit-community/prototype-qrao/pull/27
1627
[#33]: https://github.com/qiskit-community/prototype-qrao/pull/33
1728
[#34]: https://github.com/qiskit-community/prototype-qrao/pull/34
1829
[#40]: https://github.com/qiskit-community/prototype-qrao/pull/40
30+
[#49]: https://github.com/qiskit-community/prototype-qrao/pull/49

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![Platform](https://img.shields.io/badge/Platform-Linux%20%7C%20macOS%20%7C%20Windows-informational)
22
[![Python](https://img.shields.io/badge/Python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10-informational)](https://www.python.org/)
3-
[![Qiskit](https://img.shields.io/badge/Qiskit-%E2%89%A5%200.34.2-6133BD)](https://github.com/Qiskit/qiskit)
4-
[![Qiskit Optimization](https://img.shields.io/badge/Qiskit%20Optimization-%E2%89%A5%200.3.0-6133BD)](https://github.com/Qiskit/qiskit-optimization)
3+
[![Qiskit](https://img.shields.io/badge/Qiskit-%E2%89%A5%200.37.0-6133BD)](https://github.com/Qiskit/qiskit)
4+
[![Qiskit Optimization](https://img.shields.io/badge/Qiskit%20Optimization-%E2%89%A5%200.4.0-6133BD)](https://github.com/Qiskit/qiskit-optimization)
55
[![License](https://img.shields.io/github/license/qiskit-community/prototype-qrao?label=License)](https://github.com/qiskit-community/prototype-qrao/blob/main/LICENSE.txt)
66
[![Code style: Black](https://img.shields.io/badge/Code%20style-Black-000.svg)](https://github.com/psf/black)
77
[![Tests](https://github.com/qiskit-community/prototype-qrao/actions/workflows/test_latest_versions.yml/badge.svg)](https://github.com/qiskit-community/prototype-qrao/actions/workflows/test_latest_versions.yml)

tox.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
minversion = 2.4
33
envlist = py36, py37, py38, py39, py310, lint, coverage, docs
44
# CI: skip-next-line
5-
skipsdist = true
6-
# CI: skip-next-line
75
skip_missing_interpreters = true
86

97
[testenv]
10-
# CI: skip-next-line
11-
usedevelop = true
128
install_command = pip install -U {opts} {packages}
139
setenv =
1410
VIRTUAL_ENV={envdir}

0 commit comments

Comments
 (0)