From 6a771f2feddbf48db2b951b7a21b462a2c51fc25 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Tue, 6 Dec 2022 16:42:26 -0500 Subject: [PATCH 1/3] Update release notes --- NEWS.md | 12 ++++++++++++ README.md | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 18f0d66..6243fea 100644 --- a/NEWS.md +++ b/NEWS.md @@ -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 @@ -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 diff --git a/README.md b/README.md index 0413ac4..9f95785 100644 --- a/README.md +++ b/README.md @@ -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) From 8ea32c0182dd5e37b2a66d6890dfc42cfe82295d Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Wed, 7 Dec 2022 15:44:35 -0500 Subject: [PATCH 2/3] Modify `tox.ini` to work with tox 4 tox 4 has been released, and these modifications are necessary to get qrao to work with tox 4 locally. With `skipsdist = true`, `importlib_metadata` would complain. I don't understand fully why `usedevelop` had to go away. When it was set to `true`, `nbqa pylint` would fail because it was unable to import `qrao`. --- tox.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tox.ini b/tox.ini index 6c4b49d..74695c8 100644 --- a/tox.ini +++ b/tox.ini @@ -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} From 99ea69542c7cc7c75e3d1f7cb1f4a54db3a1d0fb Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Wed, 7 Dec 2022 21:26:24 -0500 Subject: [PATCH 3/3] Pin to tox<4 for now on CI Otherwise, setuptools-scm is unable to figure out the version, even if we do a non-shallow clone on GitHub Actions. (However, it does work locally.) ``` LookupError: setuptools-scm was unable to detect version for /home/runner/work/prototype-qrao/prototype-qrao. ``` https://github.com/qiskit-community/prototype-qrao/actions/runs/3644608898/jobs/6154014768 --- .github/workflows/test_development_versions.yml | 2 +- .github/workflows/test_latest_versions.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_development_versions.yml b/.github/workflows/test_development_versions.yml index b4facf8..0e9e144 100644 --- a/.github/workflows/test_development_versions.yml +++ b/.github/workflows/test_development_versions.yml @@ -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: | diff --git a/.github/workflows/test_latest_versions.yml b/.github/workflows/test_latest_versions.yml index 454ac19..7dd9899 100644 --- a/.github/workflows/test_latest_versions.yml +++ b/.github/workflows/test_latest_versions.yml @@ -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: |