Skip to content

Commit 3132653

Browse files
authored
Remove miniconda installer caching (scikit-learn#8859)
Download takes less than a second both on Travis and Circle. Also use latest miniconda installer on Circle.
1 parent b9e7614 commit 3132653

File tree

4 files changed

+5
-27
lines changed

4 files changed

+5
-27
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ cache:
88
apt: true
99
directories:
1010
- $HOME/.cache/pip
11-
- $HOME/download
1211
addons:
1312
apt:
1413
packages:

build_tools/circle/build_doc.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,11 @@ if [[ `type -t deactivate` ]]; then
9696
fi
9797

9898
# Install dependencies with miniconda
99-
pushd .
100-
cd
101-
mkdir -p download
102-
cd download
103-
echo "Cached in $HOME/download :"
104-
ls -l
105-
if [[ ! -f miniconda.sh ]]
106-
then
107-
wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh \
99+
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
108100
-O miniconda.sh
109-
fi
110101
chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
111-
cd ..
112102
export PATH="$MINICONDA_PATH/bin:$PATH"
113103
conda update --yes --quiet conda
114-
popd
115104

116105
# Configure the conda environment and put it in the path using the
117106
# provided versions

build_tools/travis/install.sh

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,13 @@ if [[ "$DISTRIB" == "conda" ]]; then
2828
# conda-based environment instead
2929
deactivate
3030

31-
# Use the miniconda installer for faster download / install of conda
32-
# itself
33-
pushd .
34-
cd
35-
mkdir -p download
36-
cd download
37-
echo "Cached in $HOME/download :"
38-
ls -l
39-
echo
31+
# Install miniconda
4032
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
4133
-O miniconda.sh
42-
chmod +x miniconda.sh && ./miniconda.sh -b -p /home/travis/miniconda
43-
cd ..
44-
export PATH=/home/travis/miniconda/bin:$PATH
34+
MINICONDA_PATH=/home/travis/miniconda
35+
chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
36+
export PATH=$MINICONDA_PATH/bin:$PATH
4537
conda update --yes conda
46-
popd
4738

4839
# Configure the conda environment and put it in the path using the
4940
# provided versions

circle.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies:
1111
cache_directories:
1212
- "~/scikit_learn_data"
1313
- "~/scikit-learn.github.io"
14-
- "~/download"
1514
# Check whether the doc build is required, install build dependencies and
1615
# run sphinx to build the doc.
1716
override:

0 commit comments

Comments
 (0)