Skip to content

Commit

Permalink
Remove miniconda installer caching (scikit-learn#8859)
Browse files Browse the repository at this point in the history
Download takes less than a second both on Travis and Circle.

Also use latest miniconda installer on Circle.
  • Loading branch information
lesteve authored May 11, 2017
1 parent b9e7614 commit 3132653
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 27 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ cache:
apt: true
directories:
- $HOME/.cache/pip
- $HOME/download
addons:
apt:
packages:
Expand Down
13 changes: 1 addition & 12 deletions build_tools/circle/build_doc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,11 @@ if [[ `type -t deactivate` ]]; then
fi

# Install dependencies with miniconda
pushd .
cd
mkdir -p download
cd download
echo "Cached in $HOME/download :"
ls -l
if [[ ! -f miniconda.sh ]]
then
wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh \
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
-O miniconda.sh
fi
chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
cd ..
export PATH="$MINICONDA_PATH/bin:$PATH"
conda update --yes --quiet conda
popd

# Configure the conda environment and put it in the path using the
# provided versions
Expand Down
17 changes: 4 additions & 13 deletions build_tools/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,13 @@ if [[ "$DISTRIB" == "conda" ]]; then
# conda-based environment instead
deactivate

# Use the miniconda installer for faster download / install of conda
# itself
pushd .
cd
mkdir -p download
cd download
echo "Cached in $HOME/download :"
ls -l
echo
# Install miniconda
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
-O miniconda.sh
chmod +x miniconda.sh && ./miniconda.sh -b -p /home/travis/miniconda
cd ..
export PATH=/home/travis/miniconda/bin:$PATH
MINICONDA_PATH=/home/travis/miniconda
chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
export PATH=$MINICONDA_PATH/bin:$PATH
conda update --yes conda
popd

# Configure the conda environment and put it in the path using the
# provided versions
Expand Down
1 change: 0 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
cache_directories:
- "~/scikit_learn_data"
- "~/scikit-learn.github.io"
- "~/download"
# Check whether the doc build is required, install build dependencies and
# run sphinx to build the doc.
override:
Expand Down

0 comments on commit 3132653

Please sign in to comment.