Skip to content

Commit cfcf737

Browse files
authored
Merge pull request #22368 from QuLogic/setuptools-broke
Pin dependencies to fix CI
2 parents bbc50e4 + 4f6de6c commit cfcf737

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ environment:
1818
PYTHONIOENCODING: UTF-8
1919
PYTEST_ARGS: -raR --numprocesses=auto --timeout=300 --durations=25
2020
--cov-report= --cov=lib --log-level=DEBUG
21-
PINNEDVERS: "pyzmq!=21.0.0 pyzmq!=22.0.0"
21+
PINNEDVERS: "pyzmq!=21.0.0,!=22.0.0"
2222

2323
matrix:
2424
# In theory we could use a single CONDA_INSTALL_LOCN because we construct
@@ -55,7 +55,7 @@ install:
5555
- conda config --prepend channels conda-forge
5656

5757
# For building, use a new environment
58-
- conda create -q -n test-environment python=%PYTHON_VERSION% tk
58+
- conda create -q -n test-environment python=%PYTHON_VERSION% tk "pip<22.0"
5959
- activate test-environment
6060
# pull pywin32 from conda because on py38 there is something wrong with finding
6161
# the dlls when insalled from pip

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ commands:
8585
command: |
8686
python -m pip install --upgrade --user pip
8787
python -m pip install --upgrade --user wheel
88-
python -m pip install --upgrade --user setuptools
88+
python -m pip install --upgrade --user 'setuptools!=60.6.0'
8989
9090
deps-install:
9191
parameters:

0 commit comments

Comments
 (0)