From 51c57a6bb4cdc093728c38b802a6169d8d655a63 Mon Sep 17 00:00:00 2001 From: Eric Arellano Date: Wed, 8 Mar 2023 12:51:57 -0600 Subject: [PATCH] Consolidate `pip install` calls in CI --- .azure/lint-linux.yml | 9 ++++++--- .azure/test-linux.yml | 30 +++++++++++++++++++++--------- .azure/test-macos.yml | 9 ++++++--- .azure/test-windows.yml | 11 +++++++---- .azure/tutorials-linux.yml | 17 ++++++++++++++--- 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/.azure/lint-linux.yml b/.azure/lint-linux.yml index fdabc2427d7f..ae3385afad41 100644 --- 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 index 60f71c049657..2f94d838976c 100644 --- a/.azure/test-linux.yml +++ b/.azure/test-linux.yml @@ -60,19 +60,25 @@ 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" @@ -80,7 +86,11 @@ jobs: - 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 index 208bb020080d..868aa42a5241 100644 --- 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 index 4d8a10f6bef3..90c3676550ea 100644 --- 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 index 3ae28279a370..d426b0b06a07 100644 --- 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