Thanks to visit codestin.com
Credit goes to github.com

Skip to content

FIX Don't use setuptools 58.5 which introduces regression #21549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 4, 2021
Merged

FIX Don't use setuptools 58.5 which introduces regression #21549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59ed703
FIX Don't use setuptools 58.5 which introduces regression
jjerphan Nov 4, 2021
c6d1767
[WIP] Adapt CI for workaround
jjerphan Nov 4, 2021
b152587
[WIP] Adapt CI for workaround
jjerphan Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions build_tools/azure/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ fi

make_conda() {
TO_INSTALL="$@"
# TODO: Remove this line once setuptools#2849 is resolved.
TO_INSTALL="$TO_INSTALL setuptools<58.5"
if [[ "$DISTRIB" == *"mamba"* ]]; then
mamba create -n $VIRTUALENV --yes $TO_INSTALL
else
Expand Down Expand Up @@ -88,7 +90,8 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
source $VIRTUALENV/bin/activate
setup_ccache
python -m pip install $(get_dep cython $CYTHON_VERSION) \
$(get_dep joblib $JOBLIB_VERSION)
$(get_dep joblib $JOBLIB_VERSION) \
"setuptools<58.5" # TODO: Remove this line once setuptools#2849 is resolved.

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

elif [[ "$DISTRIB" == "conda-pip-latest" ]]; then
# FIXME: temporary fix to link against system libraries on linux
Expand Down
6 changes: 4 additions & 2 deletions build_tools/azure/install_win.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ set -e
set -x

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

source activate $VIRTUALENV

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

if [[ "$PYTEST_XDIST_VERSION" != "none" ]]; then
Expand Down
2 changes: 2 additions & 0 deletions build_tools/circle/build_doc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ pip install "$(get_dep sphinx-gallery $SPHINX_GALLERY_VERSION)"
pip install "$(get_dep numpydoc $NUMPYDOC_VERSION)"
pip install "$(get_dep sphinx-prompt $SPHINX_PROMPT_VERSION)"
pip install "$(get_dep sphinxext-opengraph $SPHINXEXT_OPENGRAPH_VERSION)"
# TODO: Remove this line once setuptools#2849 is resolved.
pip install "setuptools<58.5"

# Set parallelism to 3 to overlap IO bound tasks with CPU bound tasks on CI
# workers with 2 cores when building the compiled extensions of scikit-learn.
Expand Down
4 changes: 3 additions & 1 deletion build_tools/circle/build_test_arm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ mamba install --verbose -y ccache \
$(get_dep joblib $JOBLIB_VERSION) \
$(get_dep threadpoolctl $THREADPOOLCTL_VERSION) \
$(get_dep pytest $PYTEST_VERSION) \
$(get_dep pytest-xdist $PYTEST_XDIST_VERSION)
$(get_dep pytest-xdist $PYTEST_XDIST_VERSION) \
"setuptools<58.5" # TODO: Remove this line once setuptools#2849 is resolved.

setup_ccache

if [[ "$COVERAGE" == "true" ]]; then
Expand Down
3 changes: 2 additions & 1 deletion build_tools/circle/build_test_pypy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ conda install -y mamba
mamba create -n pypy -y \
pypy numpy scipy cython \
joblib threadpoolctl pillow pytest \
sphinx numpydoc docutils
sphinx numpydoc docutils \
"setuptools<58.5" # TODO: remove this line once setuptools#2849 is resolved.

eval "$(conda shell.bash hook)"
conda activate pypy
Expand Down
2 changes: 2 additions & 0 deletions build_tools/travis/install_main.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ conda create -n testenv --yes python=3.7
source activate testenv
conda install -y scipy numpy pandas cython
pip install joblib threadpoolctl
# TODO: This line once setuptools#2849 is resolved.
pip install "setuptools<58.5"

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

Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[build-system]
# Minimum requirements for the build system to execute.
requires = [
"setuptools",
# TODO: Remove the specifier once setuptools#2849 is resolved.
"setuptools<58.5",
"wheel",
"Cython>=0.28.5",

Expand Down