Skip to content

Commit

Permalink
Attempt to install latest numpy in all CI jobs (Qiskit#5816)
Browse files Browse the repository at this point in the history
* Attempt to install latest numpy in all CI jobs

Since the pulse simulator in aer 0.7.4 release appears to not be
compatible with numpy releases <1.20.0 (see Qiskit/qiskit-aer#1120) we
need to ensure that we're running jobs that use aer with numpy 1.20.0
too. This commit attempts to ensure we're using the latest numpy release
in all CI jobs to unblock CI while we wait for a fixed aer release.

* Try to pin with constraints

* Fix issues with windows and 3.6

* Update azure-pipelines.yml

Co-authored-by: Kevin Krsulich <[email protected]>

* Fix lint error now being caught in AbelianGrouper
  • Loading branch information
mtreinish authored Feb 9, 2021
1 parent d29d691 commit 8188fda
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
28 changes: 14 additions & 14 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ stages:
virtualenv test-job
source test-job/bin/activate
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt .
pip install "qiskit-aer" "z3-solver" -c constraints.txt
pip install -U -c constraints.txt .
pip install -U "qiskit-aer" "z3-solver" -c constraints.txt
python setup.py build_ext --inplace
sudo apt install -y graphviz
pip check
Expand Down Expand Up @@ -229,8 +229,8 @@ stages:
virtualenv test-job
source test-job/bin/activate
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt -e .
pip install "qiskit-aer" -c constraints.txt
pip install -U -c constraints.txt -e .
pip install -U "qiskit-aer" -c constraints.txt
python setup.py build_ext --inplace
displayName: 'Install dependencies'
- bash: |
Expand Down Expand Up @@ -326,8 +326,8 @@ stages:
virtualenv test-job
source test-job/bin/activate
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt -e .
pip install "qiskit-aer" -c constraints.txt
pip install -U -c constraints.txt -e .
pip install -U "qiskit-aer" -c constraints.txt
python setup.py build_ext --inplace
pip check
displayName: 'Install dependencies'
Expand Down Expand Up @@ -399,7 +399,7 @@ stages:
python -m pip install --upgrade pip setuptools wheel virtualenv
virtualenv test-job
source test-job/Scripts/activate
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt -e .
pip install "z3-solver" -c constraints.txt
python setup.py build_ext --inplace
Expand Down Expand Up @@ -479,8 +479,8 @@ stages:
virtualenv test-job
source test-job/bin/activate
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt -e .
pip install "qiskit-aer" "z3-solver" -c constraints.txt
pip install -U -c constraints.txt -e .
pip install -U "qiskit-aer" "z3-solver" -c constraints.txt
python setup.py build_ext --inplace
sudo apt install -y graphviz
pip check
Expand Down Expand Up @@ -559,7 +559,7 @@ stages:
virtualenv test-job
source test-job/bin/activate
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt -e .
pip install -U -c constraints.txt -e .
python setup.py build_ext --inplace
pip check
displayName: 'Install dependencies'
Expand Down Expand Up @@ -623,8 +623,8 @@ stages:
git clone https://github.com/Qiskit/qiskit-tutorials --depth=1
python -m pip install --upgrade pip
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt -e .
pip install "qiskit-ibmq-provider" "qiskit-aer" "z3-solver" "git+https://github.com/Qiskit/qiskit-ignis" "qiskit-aqua" "pyscf<1.7.4" "matplotlib<3.3.0" sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt
pip install -U -c constraints.txt -e .
pip install -U "qiskit-ibmq-provider" "qiskit-aer" "z3-solver" "git+https://github.com/Qiskit/qiskit-ignis" "qiskit-aqua" "pyscf<1.7.4" "matplotlib<3.3.0" sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt
python setup.py build_ext --inplace
sudo apt install -y graphviz pandoc
pip check
Expand Down Expand Up @@ -672,8 +672,8 @@ stages:
set -e
python -m pip install --upgrade pip
pip install -U -r requirements.txt -c constraints.txt
pip install -c constraints.txt -e .
pip install "matplotlib<3.3.0" pylatexenc pillow
pip install -U -c constraints.txt -e .
pip install -U "matplotlib<3.3.0" pylatexenc pillow
python setup.py build_ext --inplace
sudo apt install -y graphviz pandoc
pip check
Expand Down
1 change: 1 addition & 0 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
docplex==2.15.194
appnope==0.1.0
numpy>=1.20.0 ; python_version>'3.6'
2 changes: 1 addition & 1 deletion qiskit/opflow/converters/abelian_grouper.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"""AbelianGrouper Class"""

from collections import defaultdict
from typing import cast, List, Optional, Tuple, Union
from typing import cast, List, Tuple, Union

import numpy as np
import retworkx as rx
Expand Down

0 comments on commit 8188fda

Please sign in to comment.