Skip to content

Commit 4a7f810

Browse files
authored
Fix failing CI tests due to old setuptools (#7249)
* Require setuptools-70 so that bdist_wheel is available * CI - upgrade setuptools and wheel before installing dev.env The initial Python environment in GHA has very old setuptools, which makes installation of dev.env requirements fail.
1 parent bdf9249 commit 4a7f810

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
sudo apt-get install libffi7
194194
- name: Install requirements
195195
run: |
196-
pip install wheel
196+
pip install --upgrade setuptools wheel
197197
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
198198
- name: Run Quil dependencies
199199
run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
@@ -289,7 +289,7 @@ jobs:
289289
sudo apt-get install libffi7
290290
- name: Install requirements
291291
run: |
292-
pip install wheel
292+
pip install --upgrade setuptools wheel
293293
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
294294
- name: Run Quil dependencies
295295
run: docker compose -f cirq-rigetti/docker-compose.test.yaml up -d
@@ -322,7 +322,7 @@ jobs:
322322
key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
323323
- name: Install requirements
324324
run: |
325-
pip install wheel
325+
pip install --upgrade setuptools wheel
326326
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
327327
- name: Pytest Windows
328328
run: |
@@ -350,7 +350,7 @@ jobs:
350350
key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
351351
- name: Install requirements
352352
run: |
353-
pip install wheel
353+
pip install --upgrade setuptools wheel
354354
pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
355355
- name: Pytest check
356356
run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib

dev_tools/requirements/deps/packaging.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ virtualenv
33

44
# for creating packages
55
# TODO (juhas) - remove when pyquil allows packaging-24
6-
setuptools<77
6+
setuptools>=70,<77
77
wheel
88

99
# for uploading packages to pypi

0 commit comments

Comments
 (0)