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

Commit

Permalink
Merge branch 'main' into solve-relaxed-using-primitives
Browse files Browse the repository at this point in the history
  • Loading branch information
garrison committed Dec 8, 2022
2 parents 8d86e18 + 740e233 commit 54fb842
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_development_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# Second, update requirements[-dev].txt in place to use the
# development (git) versions of all Qiskit packages.
sed -i 's|^\(qiskit[A-Za-z-]*\).*|git+https://github.com/Qiskit/\1.git|' requirements-dev.txt requirements.txt
pip install tox
pip install 'tox<4'
- name: Modify tox.ini for more thorough check
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_latest_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
pip install 'tox<4'
- name: Modify tox.ini for more thorough check
shell: bash
run: |
Expand Down
12 changes: 12 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
#### 0.2 (not yet released)

- 2022-11-23: The minimum required version of Qiskit is now 0.37.0,
and the minimum required version of Qiskit Optimization is now
0.4.0. Python 3.6 is no longer supported. ([#49])
- 2022-11-23: The backend tests now use qiskit-ibm-provider rather
than qiskit-ibmq-provider. ([#15])

#### 0.1 (2022-11-23)

- 2022-06-21: Magic rounding now supports all available encodings.
([#33])
- 2022-06-17: Fixed a bug in the "weighted" sampling method for magic
Expand All @@ -12,7 +22,9 @@
- 2022-06-09: Added a comparison to exact optimal function value using
`CplexOptimizer` in the first tutorial ([#27])

[#15]: https://github.com/qiskit-community/prototype-qrao/pull/15
[#27]: https://github.com/qiskit-community/prototype-qrao/pull/27
[#33]: https://github.com/qiskit-community/prototype-qrao/pull/33
[#34]: https://github.com/qiskit-community/prototype-qrao/pull/34
[#40]: https://github.com/qiskit-community/prototype-qrao/pull/40
[#49]: https://github.com/qiskit-community/prototype-qrao/pull/49
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![Platform](https://img.shields.io/badge/Platform-Linux%20%7C%20macOS%20%7C%20Windows-informational)
[![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/)
[![Qiskit](https://img.shields.io/badge/Qiskit-%E2%89%A5%200.34.2-6133BD)](https://github.com/Qiskit/qiskit)
[![Qiskit Optimization](https://img.shields.io/badge/Qiskit%20Optimization-%E2%89%A5%200.3.0-6133BD)](https://github.com/Qiskit/qiskit-optimization)
[![Qiskit](https://img.shields.io/badge/Qiskit-%E2%89%A5%200.37.0-6133BD)](https://github.com/Qiskit/qiskit)
[![Qiskit Optimization](https://img.shields.io/badge/Qiskit%20Optimization-%E2%89%A5%200.4.0-6133BD)](https://github.com/Qiskit/qiskit-optimization)
[![License](https://img.shields.io/github/license/qiskit-community/prototype-qrao?label=License)](https://github.com/qiskit-community/prototype-qrao/blob/main/LICENSE.txt)
[![Code style: Black](https://img.shields.io/badge/Code%20style-Black-000.svg)](https://github.com/psf/black)
[![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)
Expand Down
4 changes: 0 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
minversion = 2.4
envlist = py36, py37, py38, py39, py310, lint, coverage, docs
# CI: skip-next-line
skipsdist = true
# CI: skip-next-line
skip_missing_interpreters = true

[testenv]
# CI: skip-next-line
usedevelop = true
install_command = pip install -U {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
Expand Down

0 comments on commit 54fb842

Please sign in to comment.