Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consolidate pip install calls in CI #9757

Merged
merged 9 commits into from
Mar 17, 2023
Merged

Consolidate pip install calls in CI #9757

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c2c2698
Remove unnecessary `pip install` in CI
Eric-Arellano Mar 8, 2023
5994427
Consolidate `pip install` calls in CI
Eric-Arellano Mar 8, 2023
5d0e92e
Add back `-U`
Eric-Arellano Mar 8, 2023
11e0d18
Go back to editable install so Rust is in debug mode
Eric-Arellano Mar 8, 2023
3f2adb7
Add RUST_DEBUG env var so we can avoid editable install
Eric-Arellano Mar 9, 2023
3d9fbfe
Remove SETUPTOOLS_ENABLE_FEATURES and also Aer from lint job
Eric-Arellano Mar 9, 2023
9fb41ff
Merge branch 'main' of https://github.com/Qiskit/qiskit-terra into ci…
Eric-Arellano Mar 10, 2023
73b70b2
See if editable install fixes Pylint
Eric-Arellano Mar 10, 2023
68156a1
Give up on not using editable installs in CI
Eric-Arellano Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .azure/docs-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:

variables:
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
RUST_DEBUG: 1
Eric-Arellano marked this conversation as resolved.
Show resolved Hide resolved

steps:
- checkout: self
Expand Down
11 changes: 7 additions & 4 deletions .azure/lint-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:

variables:
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
RUST_DEBUG: 1

steps:
- task: UsePythonVersion@0
Expand All @@ -21,10 +22,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 -e .
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI we were calling install -e . twice here: #9756

pip install -U \
-c constraints.txt \
-r requirements.txt \
-r requirements-dev.txt \
"qiskit-aer" \
.
displayName: 'Install dependencies'
env:
SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
Expand Down
27 changes: 20 additions & 7 deletions .azure/test-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
QISKIT_SUPPRESS_PACKAGING_WARNINGS: Y
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
QISKIT_TEST_CAPTURE_STREAMS: 1
RUST_DEBUG: 1

steps:
- task: UsePythonVersion@0
Expand Down Expand Up @@ -60,27 +61,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
python setup.py sdist
pip install -U -c constraints.txt dist/qiskit-terra*.tar.gz
pip install -U \
-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 -U \
-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 -U \
-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/.
Expand Down Expand Up @@ -162,8 +173,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
Expand Down
8 changes: 6 additions & 2 deletions .azure/test-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
QISKIT_SUPPRESS_PACKAGING_WARNINGS: Y
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
QISKIT_TEST_CAPTURE_STREAMS: 1
RUST_DEBUG: 1

steps:
- task: UsePythonVersion@0
Expand All @@ -34,8 +35,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 -U \
-c constraints.txt \
-r requirements.txt \
-r requirements-dev.txt \
.
pip check
displayName: 'Install dependencies'
env:
Expand Down
10 changes: 7 additions & 3 deletions .azure/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
variables:
QISKIT_SUPPRESS_PACKAGING_WARNINGS: Y
QISKIT_TEST_CAPTURE_STREAMS: 1
RUST_DEBUG: 1

steps:
- task: UsePythonVersion@0
Expand All @@ -33,9 +34,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 -U \
-c constraints.txt \
-r requirements.txt \
-r requirements-dev.txt \
"z3-solver" \
.
pip check
displayName: 'Install dependencies'
env:
Expand Down
18 changes: 15 additions & 3 deletions .azure/tutorials-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
QISKIT_SUPPRESS_PACKAGING_WARNINGS: Y
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
QISKIT_CELL_TIMEOUT: 300
RUST_DEBUG: 1

steps:
- task: UsePythonVersion@0
Expand All @@ -22,9 +23,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 -U \
-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
Expand Down
12 changes: 9 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@

import os
import re
import sys
from setuptools import setup, find_packages, Extension
from setuptools import setup, find_packages
from setuptools_rust import Binding, RustExtension


Expand Down Expand Up @@ -100,7 +99,14 @@
"Source Code": "https://github.com/Qiskit/qiskit-terra",
},
rust_extensions=[
RustExtension("qiskit._accelerate", "crates/accelerate/Cargo.toml", binding=Binding.PyO3)
RustExtension(
"qiskit._accelerate",
"crates/accelerate/Cargo.toml",
binding=Binding.PyO3,
# If RUST_DEBUG is set, force compiling in debug mode. Else, use the default behavior
# of whether it's an editable installation.
debug=True if os.getenv("RUST_DEBUG") == 1 else None,
)
],
zip_safe=False,
entry_points={
Expand Down