Skip to content

Commit e2f6606

Browse files
Consolidate pip install calls in CI (#9757)
* Remove unnecessary `pip install` in CI * Consolidate `pip install` calls in CI * Add back `-U` * Go back to editable install so Rust is in debug mode * Add RUST_DEBUG env var so we can avoid editable install * Remove SETUPTOOLS_ENABLE_FEATURES and also Aer from lint job * See if editable install fixes Pylint * Give up on not using editable installs in CI I don't know why they're causing issues with loading the Rust extension. But it's not a priority to figure that out. This PR is still some forward progress.
1 parent 2afcebc commit e2f6606

File tree

5 files changed

+49
-19
lines changed

5 files changed

+49
-19
lines changed

.azure/lint-linux.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ jobs:
2121
python -m pip install --upgrade pip setuptools wheel virtualenv
2222
virtualenv test-job
2323
source test-job/bin/activate
24-
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
25-
pip install -U -c constraints.txt -e .
26-
pip install -U "qiskit-aer" -c constraints.txt
27-
pip install -e .
24+
pip install -U \
25+
-c constraints.txt \
26+
-r requirements.txt \
27+
-r requirements-dev.txt \
28+
-e .
2829
displayName: 'Install dependencies'
2930
env:
3031
SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"

.azure/test-linux.yml

+19-7
Original file line numberDiff line numberDiff line change
@@ -60,27 +60,37 @@ jobs:
6060
# Use stable Rust, rather than MSRV, to spot-check that stable builds properly.
6161
rustup override set stable
6262
source test-job/bin/activate
63-
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
6463
# Install setuptools-rust for building sdist
6564
pip install -U -c constraints.txt setuptools-rust
6665
python setup.py sdist
67-
pip install -U -c constraints.txt dist/qiskit-terra*.tar.gz
66+
pip install -U \
67+
-c constraints.txt \
68+
-r requirements.txt \
69+
-r requirements-dev.txt \
70+
dist/qiskit-terra*.tar.gz
6871
displayName: "Install Terra from sdist"
6972
7073
- ${{ if eq(parameters.installFromSdist, false) }}:
7174
- bash: |
7275
set -e
7376
source test-job/bin/activate
74-
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
75-
pip install -U -c constraints.txt -e .
77+
pip install -U \
78+
-c constraints.txt \
79+
-r requirements.txt \
80+
-r requirements-dev.txt \
81+
-e .
7682
displayName: "Install Terra directly"
7783
env:
7884
SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
7985
8086
- bash: |
8187
set -e
8288
source test-job/bin/activate
83-
pip install -U "cplex;python_version < '3.11'" "qiskit-aer" "z3-solver" -c constraints.txt
89+
pip install -U \
90+
-c constraints.txt \
91+
"cplex;python_version < '3.11'" \
92+
"qiskit-aer" \
93+
"z3-solver"
8494
mkdir -p /tmp/terra-tests
8595
cp -r test /tmp/terra-tests/.
8696
cp .stestr.conf /tmp/terra-tests/.
@@ -162,8 +172,10 @@ jobs:
162172
- bash: |
163173
set -e
164174
virtualenv image_tests
165-
image_tests/bin/pip install -U -r requirements.txt -c constraints.txt
166-
image_tests/bin/pip install -U -c constraints.txt -e ".[visualization]"
175+
image_tests/bin/pip install -U \
176+
-c constraints.txt \
177+
-r requirements.txt \
178+
-e ".[visualization]"
167179
sudo apt-get update
168180
sudo apt-get install -y graphviz pandoc
169181
image_tests/bin/pip check

.azure/test-macos.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ jobs:
3434
python -m pip install --upgrade pip setuptools wheel virtualenv
3535
virtualenv test-job
3636
source test-job/bin/activate
37-
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
38-
pip install -U -c constraints.txt -e .
37+
pip install -U \
38+
-c constraints.txt \
39+
-r requirements.txt \
40+
-r requirements-dev.txt \
41+
-e .
3942
pip check
4043
displayName: 'Install dependencies'
4144
env:

.azure/test-windows.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@ jobs:
3333
python -m pip install --upgrade pip setuptools wheel virtualenv
3434
virtualenv test-job
3535
source test-job/Scripts/activate
36-
pip install -r requirements.txt -r requirements-dev.txt -c constraints.txt
37-
pip install -c constraints.txt -e .
38-
pip install "z3-solver" -c constraints.txt
36+
pip install -U \
37+
-c constraints.txt \
38+
-r requirements.txt \
39+
-r requirements-dev.txt \
40+
"z3-solver" \
41+
-e .
3942
pip check
4043
displayName: 'Install dependencies'
4144
env:

.azure/tutorials-linux.yml

+14-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,20 @@ jobs:
2222
set -e
2323
git clone https://github.com/Qiskit/qiskit-tutorials --depth=1
2424
python -m pip install --upgrade pip
25-
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
26-
pip install -c constraints.txt -e .
27-
pip install "qiskit-ibmq-provider" "qiskit-aer" "z3-solver" "networkx" "matplotlib>=3.3.0" sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt
25+
pip install -U \
26+
-c constraints.txt \
27+
-r requirements.txt \
28+
-r requirements-dev.txt \
29+
"qiskit-ibmq-provider" \
30+
"qiskit-aer" \
31+
"z3-solver" \
32+
"networkx" \
33+
"matplotlib>=3.3.0" \
34+
sphinx \
35+
nbsphinx \
36+
sphinx_rtd_theme \
37+
cvxpy \
38+
-e .
2839
sudo apt-get update
2940
sudo apt-get install -y graphviz pandoc
3041
pip check

0 commit comments

Comments
 (0)