Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ matrix:
- CLIPBOARD=xsel
- COVERAGE=true
- CACHE_NAME="35_nslow"
# - USE_CACHE=true # Don't use cache for 35_nslow
- USE_CACHE=true
addons:
apt:
packages:
Expand All @@ -86,6 +86,7 @@ matrix:
- TEST_ARGS="--skip-slow --skip-network"
- PANDAS_TESTING_MODE="deprecate"
- CONDA_FORGE=true
- USE_CACHE=true
addons:
apt:
packages:
Expand Down Expand Up @@ -154,13 +155,13 @@ matrix:
- USE_CACHE=true
- python: 3.5
env:
- PYTHON_VERSION=3.5
- JOB_NAME: "35_numpy_dev"
- JOB_TAG=_NUMPY_DEV
- TEST_ARGS="--skip-slow --skip-network"
- PANDAS_TESTING_MODE="deprecate"
- CACHE_NAME="35_numpy_dev"
- USE_CACHE=true
- PYTHON_VERSION=3.5
- JOB_NAME: "35_numpy_dev"
- JOB_TAG=_NUMPY_DEV
- TEST_ARGS="--skip-slow --skip-network"
- PANDAS_TESTING_MODE="deprecate"
- CACHE_NAME="35_numpy_dev"
- USE_CACHE=true
- python: 3.5
env:
- PYTHON_VERSION=3.5
Expand Down
2 changes: 1 addition & 1 deletion ci/install_travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if [ -e ${INSTALL} ]; then
else
# create new env
# this may already exists, in which case our caching worked
time conda create -n pandas python=$PYTHON_VERSION pytest
time conda create -n pandas python=$PYTHON_VERSION pytest nomkl
fi

# build deps
Expand Down