Merge pull request #612 from mtreinish/prepare-0.7.1

Prepare 0.7.1 release

.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

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
@@ -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.
 
@@ -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).
 

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

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 ---------------------------------------------------
 

qiskit/ignis/VERSION.txt

@@ -1 +1 @@
-0.7.0
+0.7.1

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.

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

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'],

tox.ini

@@ -15,15 +15,13 @@ 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
     stestr run {posargs}
 
 [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