From d0d390c63f9b9c9c531c50f79ed20522a3f62f25 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 11 Apr 2022 16:18:26 -0400 Subject: [PATCH 1/6] Drop 3.6 testing (#610) * Drop 3.6 testing Upstream Qiskit has dropped support for python 3.6. Since ignis is in maintenance mode pending archive we can just drop testing for this. This commit does this and removes the python 3.6 job. Since we're not doing active feature development anymore we don't have to worry too much about Python 3.6 compat. If need to release again before the archive we can revisit the minimum supported python version in that release. As ignis is pure Python there are less compatibility issues to worry about. * Pin scs version The latest scs releases are causing a failure. This commit pins it to the last known working version in CI. * Use windows server 2019 for ci jobs * Pin cvxopt too * Remove terra source install * Drop broken windows CI env (cherry picked from commit 7506df84113082fec5b011b3d4f55fae16f719a5) --- .github/workflows/main.yml | 8 ++++---- constraints.txt | 2 ++ tox.ini | 4 ---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9182fc7ba..032adf920 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] os: ["ubuntu-latest"] steps: - uses: actions/checkout@v2 @@ -37,7 +37,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] os: ["macOS-latest"] steps: - uses: actions/checkout@v2 @@ -87,10 +87,10 @@ jobs: run: tox -e no-opt windows-tests: name: tests-python${{ matrix.python-version }}-windows - runs-on: windows-latest + runs-on: 'windows-2019' strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.8, 3.9] steps: - uses: actions/checkout@v2 - name: Add msbuild to PATH diff --git a/constraints.txt b/constraints.txt index 2281e47b8..7ac4c6a3a 100644 --- a/constraints.txt +++ b/constraints.txt @@ -4,3 +4,5 @@ pywin32==225 setuptools==49.6.0 pyfakefs==4.1.0 cvxpy==1.1.7 +scs==2.1.4 +cvxopt==1.2.7 diff --git a/tox.ini b/tox.ini index e18f6116b..6f55860dc 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,6 @@ deps = numpy>=1.16.3 setuptools>=40.1.0 passenv = QISKIT_IN_PARALLEL commands = - pip install -U -c constraints.txt git+https://github.com/Qiskit/qiskit-terra.git pip install -U -c constraints.txt -r{toxinidir}/requirements-dev.txt pip install -c constraints.txt cvxpy<1.1.8 pip check @@ -23,7 +22,6 @@ commands = [testenv:no-opt] deps = - git+https://github.com/Qiskit/qiskit-terra.git qiskit-aer ddt>=1.2.0,!=1.4.0 stestr>=2.5.0 @@ -35,7 +33,6 @@ commands = [testenv:lint] basepython = python3 deps = - git+https://github.com/Qiskit/qiskit-terra.git qiskit-aer scikit-learn>=0.17 ddt @@ -53,7 +50,6 @@ setenv = {[testenv]setenv} QISKIT_SUPPRESS_PACKAGING_WARNINGS=Y deps = - git+https://github.com/Qiskit/qiskit-terra.git -r{toxinidir}/requirements-dev.txt commands = sphinx-build -b html {posargs} docs/ docs/_build/html From e87110c000af599efa675a1fb1a0f5dcc9826b9b Mon Sep 17 00:00:00 2001 From: Jake Lishman Date: Mon, 11 Apr 2022 17:04:20 -0400 Subject: [PATCH 2/6] Unconditionally depend on jupyter_sphinx for dev (#608) The original constraint was added in gh-505, at a time when Aer was specifically requiring jupyter_sphinx in its own `requirements-dev.txt` under certain constraints. The constraint no longer appears to be needed, so all it serves to do now is to cause the docs build to fail on Python 3.9. (cherry picked from commit 0e3716c0f0e78225a21016dcadfe124fad885d71) --- requirements-dev.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 241d8d69e..6172c0135 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,8 +8,7 @@ sphinx-tabs>=1.1.11 sphinx-autodoc-typehints stestr>=2.5.0 ddt>=1.2.0,!=1.4.0 -jupyter;python_version<'3.9' -jupyter-sphinx;python_version<'3.9' +jupyter-sphinx reno matplotlib pyfakefs From 47c73f998b05714dd86af0710541ff0a689a9ded Mon Sep 17 00:00:00 2001 From: James Wootton Date: Mon, 11 Apr 2022 23:38:44 +0200 Subject: [PATCH 3/6] Topological codes migration (#605) Add details on where topological_codes can now be found. (cherry picked from commit dd849385c191f4702503d099c648c72561aba8ab) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7747e5607..abe6e3789 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ was migrated into the `qiskit-experiments` package and into `qiskit-terra`. * Randomized benchmarking, Quantum Volume and State and Process Tomography were migrated to [`qiskit-experiments`](https://github.com/Qiskit/qiskit-experiments). * Migration of Gate-set tomography to [`qiskit-experiments`](https://github.com/Qiskit/qiskit-experiments) is in progress. - * Currently the Accredition, Entanglement and Topological code modules have not been migrated. - + * `topological_codes` will continue development under [NCCR-SPIN](https://github.com/NCCR-SPIN/topological_codes/blob/master/README.md), while the functionality is reintegrated into Qiskit. Some additional functionality can also be found in the offshoot project [qtcodes](https://github.com/yaleqc/qtcodes). + * Currently the Accredition and Entanglement modules have not been migrated. The following table gives a more detailed breakdown that relates the function, as it existed in Ignis, to where it now lives after this move. From d45e3d494e66f3a67befc604127653902517e353 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Mon, 11 Apr 2022 18:07:39 -0400 Subject: [PATCH 4/6] Update README.md: `pip install qiskit` no longer installs all elements (#609) * Update README.md: `pip install qiskit` no longer installs all elements * Fix typo in README (cherry picked from commit 0fb96d52060a488dbad405bb5aca49a2cda1dd1e) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index abe6e3789..bb567d88c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![License](https://img.shields.io/github/license/Qiskit/qiskit-ignis.svg?style=popout-square)](https://opensource.org/licenses/Apache-2.0)[![Build Status](https://img.shields.io/travis/com/Qiskit/qiskit-ignis/master.svg?style=popout-square)](https://travis-ci.com/Qiskit/qiskit-ignis)[![](https://img.shields.io/github/release/Qiskit/qiskit-ignis.svg?style=popout-square)](https://github.com/Qiskit/qiskit-ignis/releases)[![](https://img.shields.io/pypi/dm/qiskit-ignis.svg?style=popout-square)](https://pypi.org/project/qiskit-ignis/) **_NOTE_** _As of the version 0.7.0 Qiskit Ignis is deprecated and has been -supersceded by the +superseded by the [Qiskit Experiments](https://github.com/Qiskit/qiskit-experiments) project. Active development on the project has stopped and only compatibility fixes and other critical bugfixes will be accepted until the project is officially @@ -57,13 +57,13 @@ to where it now lives after this move. ## Installation -We encourage installing Qiskit via the PIP tool (a python package manager), which installs all Qiskit elements, including this one. +We encourage installing Qiskit via the pip tool (a python package manager). The following command installs the core Qiskit components, including Ignis. ```bash pip install qiskit ``` -PIP will handle all dependencies automatically for us and you will always install the latest (and well-tested) version. +Pip will handle all dependencies automatically for us and you will always install the latest (and well-tested) version. To install from source, follow the instructions in the [contribution guidelines](./CONTRIBUTING.md). From c05301aa8def5b464f843f60b77bcfcf437909dd Mon Sep 17 00:00:00 2001 From: Bastian Zimmermann <10774221+BastianZim@users.noreply.github.com> Date: Fri, 6 May 2022 15:47:05 +0200 Subject: [PATCH 5/6] Don't include docs in discovered packages (#611) Currently, docs is included as a separate package. This pollutes the user environment when installing the package. This commit excludes the docs dir from the package. (cherry picked from commit ce9c5945ee67ca79f5c92fff5179ccd6f038e399) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3713cbc90..c2c22e0c9 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ "Topic :: Scientific/Engineering", ], keywords="qiskit sdk quantum", - packages=setuptools.find_namespace_packages(exclude=['test*']), + packages=setuptools.find_namespace_packages(exclude=['test*', 'docs']), extras_require={ 'visualization': ['matplotlib>=2.1'], 'cvx': ['cvxpy>=1.0.15'], From 3176f61a827c9b00ba006cdaad787fca55acc3a1 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Tue, 17 May 2022 15:49:46 -0400 Subject: [PATCH 6/6] Prepare 0.7.1 release This commit prepares for the 0.7.1 bugfix release which fixes a small packaging bug that caused the docs tree to get incorrectly included as a package. This release will likely be the last release for qiskit-ignis before the project is retired/archived. --- docs/conf.py | 2 +- qiskit/ignis/VERSION.txt | 2 +- releasenotes/notes/prepare-0.7.1-520c1e0dba0521f7.yaml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/prepare-0.7.1-520c1e0dba0521f7.yaml diff --git a/docs/conf.py b/docs/conf.py index 94695f41b..19db791f9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -46,7 +46,7 @@ # The short X.Y version version = '' # The full version, including alpha/beta/rc tags -release = '0.7.0' +release = '0.7.1' # -- General configuration --------------------------------------------------- diff --git a/qiskit/ignis/VERSION.txt b/qiskit/ignis/VERSION.txt index faef31a43..39e898a4f 100644 --- a/qiskit/ignis/VERSION.txt +++ b/qiskit/ignis/VERSION.txt @@ -1 +1 @@ -0.7.0 +0.7.1 diff --git a/releasenotes/notes/prepare-0.7.1-520c1e0dba0521f7.yaml b/releasenotes/notes/prepare-0.7.1-520c1e0dba0521f7.yaml new file mode 100644 index 000000000..53745466f --- /dev/null +++ b/releasenotes/notes/prepare-0.7.1-520c1e0dba0521f7.yaml @@ -0,0 +1,5 @@ +--- +prelude: | + This is a bugfix release that primarily fixes a packaging issue that was + causing the ``docs/`` directory, which contains the source files used to + build the qiskit-ignis documentation, to get included in the Python package.