Skip to content

Commit 953d101

Browse files
jjerphanjjerphan
authored
HOTFIX Don't use setuptools 58.5 which introduces regression (#21549)
1 parent 48e5423 commit 953d101

7 files changed

Lines changed: 21 additions & 7 deletions

File tree

‎build_tools/azure/install.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ fi
1313

1414
make_conda() {
1515
TO_INSTALL="$@"
16+
# TODO: Remove this line once setuptools#2849 is resolved.
17+
TO_INSTALL="$TO_INSTALL setuptools<58.5"
1618
if [[ "$DISTRIB" == *"mamba"* ]]; then
1719
mamba create -n $VIRTUALENV --yes $TO_INSTALL
1820
else
@@ -88,7 +90,8 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
8890
source $VIRTUALENV/bin/activate
8991
setup_ccache
9092
python -m pip install $(get_dep cython $CYTHON_VERSION) \
91-
$(get_dep joblib $JOBLIB_VERSION)
93+
$(get_dep joblib $JOBLIB_VERSION) \
94+
"setuptools<58.5" # TODO: Remove this line once setuptools#2849 is resolved.
9295

9396
elif [[ "$DISTRIB" == "debian-32" ]]; then
9497
apt-get update
@@ -98,7 +101,8 @@ elif [[ "$DISTRIB" == "debian-32" ]]; then
98101
source $VIRTUALENV/bin/activate
99102
setup_ccache
100103
python -m pip install $(get_dep cython $CYTHON_VERSION) \
101-
$(get_dep joblib $JOBLIB_VERSION)
104+
$(get_dep joblib $JOBLIB_VERSION) \
105+
"setuptools<58.5" # TODO: Remove this line once setuptools#2849 is resolved.
102106

103107
elif [[ "$DISTRIB" == "conda-pip-latest" ]]; then
104108
# FIXME: temporary fix to link against system libraries on linux

‎build_tools/azure/install_win.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ set -e
44
set -x
55

66
if [[ "$PYTHON_ARCH" == "64" ]]; then
7-
conda create -n $VIRTUALENV -q -y python=$PYTHON_VERSION numpy scipy cython matplotlib wheel pillow joblib
7+
conda create -n $VIRTUALENV -q -y python=$PYTHON_VERSION numpy scipy cython matplotlib wheel pillow joblib \
8+
"setuptools<58.5" # TODO: Remove this line once setuptools#2849 is resolved.
89

910
source activate $VIRTUALENV
1011

@@ -16,7 +17,8 @@ if [[ "$PYTHON_ARCH" == "64" ]]; then
1617
pip install pytest==$PYTEST_VERSION
1718
fi
1819
else
19-
pip install numpy scipy cython pytest wheel pillow joblib threadpoolctl
20+
pip install numpy scipy cython pytest wheel pillow joblib threadpoolctl \
21+
"setuptools<58.5" # TODO: Remove this line once setuptools#2849 is resolved.
2022
fi
2123

2224
if [[ "$PYTEST_XDIST_VERSION" != "none" ]]; then

‎build_tools/circle/build_doc.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ pip install "$(get_dep sphinx-gallery $SPHINX_GALLERY_VERSION)"
181181
pip install "$(get_dep numpydoc $NUMPYDOC_VERSION)"
182182
pip install "$(get_dep sphinx-prompt $SPHINX_PROMPT_VERSION)"
183183
pip install "$(get_dep sphinxext-opengraph $SPHINXEXT_OPENGRAPH_VERSION)"
184+
# TODO: Remove this line once setuptools#2849 is resolved.
185+
pip install "setuptools<58.5"
184186

185187
# Set parallelism to 3 to overlap IO bound tasks with CPU bound tasks on CI
186188
# workers with 2 cores when building the compiled extensions of scikit-learn.

‎build_tools/circle/build_test_arm.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ mamba install --verbose -y ccache \
5050
$(get_dep joblib $JOBLIB_VERSION) \
5151
$(get_dep threadpoolctl $THREADPOOLCTL_VERSION) \
5252
$(get_dep pytest $PYTEST_VERSION) \
53-
$(get_dep pytest-xdist $PYTEST_XDIST_VERSION)
53+
$(get_dep pytest-xdist $PYTEST_XDIST_VERSION) \
54+
"setuptools<58.5" # TODO: Remove this line once setuptools#2849 is resolved.
55+
5456
setup_ccache
5557

5658
if [[ "$COVERAGE" == "true" ]]; then

‎build_tools/circle/build_test_pypy.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ conda install -y mamba
1313
mamba create -n pypy -y \
1414
pypy numpy scipy cython \
1515
joblib threadpoolctl pillow pytest \
16-
sphinx numpydoc docutils
16+
sphinx numpydoc docutils \
17+
"setuptools<58.5" # TODO: remove this line once setuptools#2849 is resolved.
1718

1819
eval "$(conda shell.bash hook)"
1920
conda activate pypy

‎build_tools/travis/install_main.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ conda create -n testenv --yes python=3.7
4747
source activate testenv
4848
conda install -y scipy numpy pandas cython
4949
pip install joblib threadpoolctl
50+
# TODO: This line once setuptools#2849 is resolved.
51+
pip install "setuptools<58.5"
5052

5153
pip install $(get_dep pytest $PYTEST_VERSION) pytest-xdist
5254

‎pyproject.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[build-system]
22
# Minimum requirements for the build system to execute.
33
requires = [
4-
"setuptools",
4+
# TODO: Remove the specifier once setuptools#2849 is resolved.
5+
"setuptools<58.5",
56
"wheel",
67
"Cython>=0.28.5",
78

0 commit comments

Comments
 (0)