Skip to content

Commit 8088254

Browse files
committed
MAINT,BLD: pin setuptools and refactor where to find it
1 parent 24748cb commit 8088254

7 files changed

+11
-9
lines changed

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ stages:
241241
fi
242242
displayName: 'add gcc 4.8'
243243
- script: |
244-
python3 -m pip install --user --upgrade pip setuptools
244+
python3 -m pip install --user --upgrade pip
245245
python3 -m pip install --user -r test_requirements.txt
246246
CPPFLAGS='' CC=gcc-4.8 F77=gfortran-5 F90=gfortran-5 \
247247
python3 runtests.py --debug-info --mode=full -- -rsx --junitxml=junit/test-results.xml

azure-steps-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
versionSpec: $(PYTHON_VERSION)
55
addToPath: true
66
architecture: $(PYTHON_ARCH)
7-
- script: python -m pip install --upgrade pip setuptools wheel
7+
- script: python -m pip install --upgrade pip
88
displayName: 'Install tools'
99
- script: python -m pip install -r test_requirements.txt
1010
displayName: 'Install dependencies; some are optional to avoid test skips'

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[build-system]
22
# Minimum requirements for the build system to execute.
33
requires = [
4-
"setuptools",
4+
"setuptools!=49.2.0",
55
"wheel",
66
"Cython>=0.29.21", # Note: keep in sync with tools/cythonize.py
77
]

shippable.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
branches:
2-
except:
3-
- master
4-
- maintenance/*
2+
only:
3+
- master
4+
- maintenance/*
55

66
language: python
77

test_requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
cython==0.29.21
2+
wheel
3+
setuptools!=49.2.0
24
hypothesis==5.19.1
35
pytest==5.4.3
46
pytz==2020.1

tools/pypy-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ wget -q https://downloads.python.org/pypy/pypy3.6-v7.3.1-linux64.tar.bz2 -O pypy
3333
mkdir -p pypy3
3434
(cd pypy3; tar --strip-components=1 -xf ../pypy.tar.bz2)
3535
pypy3/bin/pypy3 -mensurepip
36-
pypy3/bin/pypy3 -m pip install --upgrade pip setuptools wheel
36+
pypy3/bin/pypy3 -m pip install --upgrade pip
3737
pypy3/bin/pypy3 -m pip install --user -r test_requirements.txt --no-warn-script-location
3838

3939
echo

tools/travis-before-install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ gcc --version
2929

3030
popd
3131

32-
pip install --upgrade pip
32+
pip install --upgrade pip setuptools!=49.2.0 wheel
3333

3434
# 'setuptools', 'wheel' and 'cython' are build dependencies. This information
3535
# is stored in pyproject.toml, but there is not yet a standard way to install
@@ -41,7 +41,7 @@ pip install --upgrade pip
4141
# A specific version of cython is required, so we read the cython package
4242
# requirement using `grep cython test_requirements.txt` instead of simply
4343
# writing 'pip install setuptools wheel cython'.
44-
pip install setuptools wheel `grep cython test_requirements.txt`
44+
pip install `grep cython test_requirements.txt`
4545

4646
if [ -n "$DOWNLOAD_OPENBLAS" ]; then
4747
pwd

0 commit comments

Comments
 (0)