Skip to content

Commit 4a508c2

Browse files
authored
Merge pull request #10866 from pradyunsg/setuptools-ci-hotfix
2 parents 193259d + ef7e0c3 commit 4a508c2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
if: matrix.os == 'MacOS'
131131
run: brew install bzr
132132

133-
- run: pip install nox 'virtualenv<20'
133+
- run: pip install nox 'virtualenv<20' 'setuptools != 60.6.0'
134134

135135
# Main check
136136
- name: Run unit tests

tests/requirements-common_wheels.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# 4. Replacing the `setuptools` entry below with a `file:///...` URL
66
# (Adjust artifact directory used based on preference and operating system)
77

8-
setuptools >= 40.8.0
8+
setuptools >= 40.8.0, != 60.6.0
99
wheel
1010
# As required by pytest-cov.
1111
coverage >= 4.4

0 commit comments

Comments
 (0)