From 9a77892a7dadc378914252f956637609639e5c76 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Fri, 29 Sep 2017 17:26:07 +0100 Subject: [PATCH 1/2] Upgraded travis to python 3.6 --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e4f3969..321e6a36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ sudo: false python: - "2.7" - - "3.4" + - "3.6" install: - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then @@ -21,9 +21,6 @@ install: - conda info -a - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION nose numpy matplotlib bokeh pandas scipy jupyter ipython param freetype=2.5.2 flake8 mock filelock - source activate test-environment - - if [[ "$TRAVIS_PYTHON_VERSION" == "3.4" ]]; then - conda install python=3.4.3; - fi - pip install coveralls - pip install git+https://github.com/ioam/holoviews.git - conda install -c conda-forge iris cartopy xarray From 5d1197ccf1bc5e0470fe6cf7a38f86073658b725 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Fri, 29 Sep 2017 17:31:31 +0100 Subject: [PATCH 2/2] Removed pinned freetype version from .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 321e6a36..6e3eddf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: - conda update -q conda # Useful for debugging any issues with conda - conda info -a - - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION nose numpy matplotlib bokeh pandas scipy jupyter ipython param freetype=2.5.2 flake8 mock filelock + - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION nose numpy matplotlib bokeh pandas scipy jupyter ipython param flake8 mock filelock - source activate test-environment - pip install coveralls - pip install git+https://github.com/ioam/holoviews.git