Commit 5bd14a23 authored by Andreas Mueller's avatar Andreas Mueller Committed by GitHub

Merge pull request #231 from amueller/travis_update

add python 3.6 to travis, update numpy, update pip on travis
parents 798f0058 64899859
......@@ -12,8 +12,8 @@ env:
- DISTRIB="ubuntu" PYTHON_VERSION="2.7"
# This environment tests the oldest supported anaconda env
- DISTRIB="conda" PYTHON_VERSION="2.7" NUMPY_VERSION="1.7.1"
# This environment tests the newest supported anaconda env
- DISTRIB="conda" PYTHON_VERSION="3.4" NUMPY_VERSION="1.10.1"
- DISTRIB="conda" PYTHON_VERSION="3.4" NUMPY_VERSION="1.11.2"
- DISTRIB="conda" PYTHON_VERSION="3.6" NUMPY_VERSION="1.11.2"
install: source continuous_integration/install.sh
cache: apt
script: nosetests
......@@ -37,7 +37,8 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
# Use standard ubuntu packages in their default version
virtualenv --system-site-packages testvenv
source testvenv/bin/activate
pip install nose mock matplotlib pillow
pip install -U setuptools
pip install nose mock matplotlib==1.5.3 pillow
fi
python --version
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment