Skip to content

MNT pin PyWavelet in doc-min builds #21607

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 4 commits into from
Nov 12, 2021
Merged

MNT pin PyWavelet in doc-min builds #21607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f63dab3
MNT try conda-forge for min-doc-build
glemaitre Nov 9, 2021
f130b65
[doc build] trigger doc build
glemaitre Nov 9, 2021
b99e568
iter
glemaitre Nov 10, 2021
748b643
iter
glemaitre Nov 10, 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
11 changes: 8 additions & 3 deletions build_tools/circle/build_doc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ fi

MINICONDA_PATH=$HOME/miniconda
# Install dependencies with miniconda
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
-O miniconda.sh
wget https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh \
-O miniconda.sh
Comment on lines +148 to +149
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

O_o do we want to switch to mamba? why not miniforge?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was for debugging reasons first. Then, I assume that mamba will be faster than conda to resolve the dependencies required here.

chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
export PATH="/usr/lib/ccache:$MINICONDA_PATH/bin:$PATH"

Expand All @@ -165,7 +165,7 @@ fi
source build_tools/shared.sh

# packaging won't be needed once setuptools starts shipping packaging>=17.0
conda create -n $CONDA_ENV_NAME --yes --quiet \
mamba create -n $CONDA_ENV_NAME --yes --quiet \
python="${PYTHON_VERSION:-*}" \
"$(get_dep numpy $NUMPY_VERSION)" \
"$(get_dep scipy $SCIPY_VERSION)" \
Expand All @@ -176,6 +176,11 @@ conda create -n $CONDA_ENV_NAME --yes --quiet \
joblib memory_profiler packaging seaborn pillow pytest coverage

source activate testenv
# Pin PyWavelet to 1.1.1 that is the latest version that support our minumum
# NumPy version required. If PyWavelets 1.2+ is installed, it would require
# NumPy 1.17+ that trigger a bug with Pandas 0.25:
# https://github.com/numpy/numpy/issues/18355#issuecomment-774610226
pip install PyWavelets==1.1.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need a comment here, or in our min dependency file, which would remind us to remove this once we bump our min numpy requirement.

pip install "$(get_dep scikit-image $SCIKIT_IMAGE_VERSION)"
pip install "$(get_dep sphinx-gallery $SPHINX_GALLERY_VERSION)"
pip install "$(get_dep numpydoc $NUMPYDOC_VERSION)"
Expand Down
7 changes: 7 additions & 0 deletions sklearn/_min_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
if platform.python_implementation() == "PyPy":
NUMPY_MIN_VERSION = "1.19.0"
else:
# We pinned PyWavelet (a scikit-image dependence) to 1.1.1 in the minimum
# documentation CI builds that is the latest version that support our
# minimum NumPy version required. If PyWavelets 1.2+ is installed, it would
# require NumPy 1.17+ that trigger a bug with Pandas 0.25:
# https://github.com/numpy/numpy/issues/18355#issuecomment-774610226
# When upgrading NumPy, we can unpin PyWavelets but we need to update the
# minimum version of Pandas >= 1.0.5.
NUMPY_MIN_VERSION = "1.14.6"

SCIPY_MIN_VERSION = "1.1.0"
Expand Down