8000 Remove caching from Travis · scikit-learn/scikit-learn@7c731a6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7c731a6

Browse files
lestevelesteve
committed
Remove caching from Travis
Cython dependencies are taken care of by Cython.Build.cythonize and based on file timestamps, so .C and .so files will always be rebuild from scratch on each build in Travis.
1 parent 768399b commit 7c731a6

File tree

3 files changed

+3
-24
lines changed

3 files changed

+3
-24
lines changed

‎.travis.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ language: python
66
# Pre-install packages for the ubuntu distribution
77
cache:
88
apt: true
9-
# We use three different cache directory
10-
# to work around a Travis bug with multi-platform cache
119
directories:
12-
- $HOME/sklearn_build_ubuntu
13-
- $HOME/sklearn_build_oldest
14-
- $HOME/sklearn_build_latest
15-
- $HOME/sklearn_build_numpy_dev
1610
- $HOME/.cache/pip
1711
- $HOME/download
1812
addons:
@@ -33,21 +27,19 @@ env:
3327
# This environment tests that scikit-learn can be built against
3428
# versions of numpy, scipy with ATLAS that comes with Ubuntu Precise 12.04
3529
- DISTRIB="ubuntu" PYTHON_VERSION="2.7" CYTHON_VERSION="0.23.4"
36-
CACHED_BUILD_DIR="$HOME/sklearn_build_ubuntu" COVERAGE=true
30+
COVERAGE=true
3731
# This environment tests the oldest supported anaconda env
3832
- DISTRIB="conda" PYTHON_VERSION="2.6" INSTALL_MKL="false"
3933
NUMPY_VERSION="1.6.2" SCIPY_VERSION="0.11.0" CYTHON_VERSION="0.21"
40-
CACHED_BUILD_DIR="$HOME/sklearn_build_oldest"
4134
# This environment tests the newest supported anaconda env
4235
# It also runs tests requiring Pandas.
4336
- DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="true"
4437
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" PANDAS_VERSION="0.18.0"
45-
CYTHON_VERSION="0.23.4" CACHED_BUILD_DIR="$HOME/sklearn_build_latest"
38+
CYTHON_VERSION="0.23.4"
4639
# flake8 linting on diff wrt common ancestor with upstream/master
4740
- RUN_FLAKE8="true" SKIP_TESTS="true"
4841
DISTRIB="conda" PYTHON_VERSION="3.5" INSTALL_MKL="true"
4942
NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4"
50-
CACHED_BUILD_DIR="$HOME/dummy"
5143

5244

5345
matrix:
@@ -66,7 +58,6 @@ matrix:
6658
# the before_install step with and addons/apt/packages declaration.
6759
- python: 3.5
6860
env: DISTRIB="scipy-dev-wheels"
69-
CACHED_BUILD_DIR="$HOME/sklearn_build_numpy_dev"
7061
sudo: True
7162
before_install: sudo apt-get install -yqq libatlas3gf-base libatlas-dev
7263

‎build_tools/travis/install.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,6 @@ fi
101101
if [[ "$SKIP_TESTS" == "true" ]]; then
102102
echo "No need to build scikit-learn when not running the tests"
103103
else
104-
if [ ! -d "$CACHED_BUILD_DIR" ]; then
105-
mkdir -p $CACHED_BUILD_DIR
106-
fi
107-
108-
rsync -av --exclude '.git/' --exclude='testvenv/' \
109-
$TRAVIS_BUILD_DIR $CACHED_BUILD_DIR
110-
111-
cd $CACHED_BUILD_DIR/scikit-learn
112-
113104
# Build scikit-learn in the install.sh script to collapse the verbose
114105
# build output in the travis output when it succeeds.
115106
python --version

‎build_tools/travis/test_script.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ run_tests() {
3939
nosetests -s --with-timer --timer-top-n 20 sklearn
4040
fi
4141

42-
# Is directory still empty ?
43-
ls -ltra
44-
4542
# Test doc
46-
cd $CACHED_BUILD_DIR/scikit-learn
43+
cd $OLDPWD
4744
make test-doc test-sphinxext
4845
}
4946

0 commit comments

Comments
 (0)
0