Consolidate pip install calls in CI

Qiskit · Mar 8, 2023 · 51c57a6 · 51c57a6
1 parent c2c2698
commit 51c57a6
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 22 deletions.
diff --git a/.azure/lint-linux.yml b/.azure/lint-linux.yml
@@ -21,9 +21,12 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
           source test-job/bin/activate
-          pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -U -c constraints.txt -e .
-          pip install -U "qiskit-aer" -c constraints.txt
+          pip install \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            "qiskit-aer" \
+            .
         displayName: 'Install dependencies'
         env:
           SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"

diff --git a/.azure/test-linux.yml b/.azure/test-linux.yml
@@ -60,27 +60,37 @@ jobs:
             # Use stable Rust, rather than MSRV, to spot-check that stable builds properly.
             rustup override set stable
             source test-job/bin/activate
-            pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
             # Install setuptools-rust for building sdist
-            pip install -U -c constraints.txt setuptools-rust
+            pip install -c constraints.txt setuptools-rust
             python setup.py sdist
-            pip install -U -c constraints.txt dist/qiskit-terra*.tar.gz
+            pip install \
+              -c constraints.txt \
+              -r requirements.txt \
+              -r requirements-dev.txt
+              dist/qiskit-terra*.tar.gz
           displayName: "Install Terra from sdist"
 
       - ${{ if eq(parameters.installFromSdist, false) }}:
         - bash: |
             set -e
             source test-job/bin/activate
-            pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-            pip install -U -c constraints.txt -e .
+            pip install \
+              -c constraints.txt
+              -r requirements.txt \
+              -r requirements-dev.txt
+              .
           displayName: "Install Terra directly"
           env:
             SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
       - bash: |
           set -e
           source test-job/bin/activate
-          pip install -U "cplex;python_version < '3.11'" "qiskit-aer" "z3-solver" -c constraints.txt
+          pip install \
+            -c constraints.txt \
+            "cplex;python_version < '3.11'" \
+            "qiskit-aer" \
+            "z3-solver"
           mkdir -p /tmp/terra-tests
           cp -r test /tmp/terra-tests/.
           cp .stestr.conf /tmp/terra-tests/.
@@ -107,7 +117,7 @@ jobs:
           set -e
           source test-job/bin/activate
           cp tools/subunit_to_junit.py /tmp/terra-tests/.
-          pip install -U junitxml
+          pip install junitxml
           pushd /tmp/terra-tests
           mkdir -p junit
           stestr last --subunit | ./subunit_to_junit.py -o junit/test-results.xml
@@ -162,8 +172,10 @@ jobs:
         - bash: |
             set -e
             virtualenv image_tests
-            image_tests/bin/pip install -U -r requirements.txt -c constraints.txt
-            image_tests/bin/pip install -U -c constraints.txt -e ".[visualization]"
+            image_tests/bin/pip install -U \
+              -c constraints.txt \
+              -r requirements.txt \
+              ".[visualization]"
             sudo apt-get update
             sudo apt-get install -y graphviz pandoc
             image_tests/bin/pip check

diff --git a/.azure/test-macos.yml b/.azure/test-macos.yml
@@ -34,8 +34,11 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
           source test-job/bin/activate
-          pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -U -c constraints.txt -e .
+          pip install \
+            -c constraints.txt
+            -r requirements.txt \
+            -r requirements-dev.txt
+            .
           pip check
         displayName: 'Install dependencies'
         env:
@@ -55,7 +58,7 @@ jobs:
       - bash: |
           set -e
           source test-job/bin/activate
-          pip install -U junitxml
+          pip install junitxml
           mkdir -p junit
           stestr last --subunit | tools/subunit_to_junit.py -o junit/test-results.xml
           pushd .stestr

diff --git a/.azure/test-windows.yml b/.azure/test-windows.yml
@@ -33,9 +33,12 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
           source test-job/Scripts/activate
-          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
+          pip install \
+            -c constraints.txt
+            -r requirements.txt \
+            -r requirements-dev.txt
+            "z3-solver"
+            .
           pip check
         displayName: 'Install dependencies'
         env:
@@ -59,7 +62,7 @@ jobs:
           set -e
           chcp.com 65001
           source test-job/Scripts/activate
-          pip install -U junitxml
+          pip install junitxml
           mkdir -p junit
           stestr last --subunit | python tools/subunit_to_junit.py -o junit/test-results.xml
           pushd .stestr

diff --git a/.azure/tutorials-linux.yml b/.azure/tutorials-linux.yml
@@ -22,9 +22,20 @@ jobs:
           set -e
           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" "networkx" "matplotlib>=3.3.0" sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt
+          pip install \
+            -c constraints.txt
+            -r requirements.txt \
+            -r requirements-dev.txt
+            "qiskit-ibmq-provider" \
+            "qiskit-aer" \
+            "z3-solver" \
+            "networkx" \
+            "matplotlib>=3.3.0" \
+            sphinx \
+            nbsphinx \
+            sphinx_rtd_theme \
+            cvxpy \
+            .
           sudo apt-get update
           sudo apt-get install -y graphviz pandoc
           pip check