From 72992e4151c68daf49bb268371b18db737e5f095 Mon Sep 17 00:00:00 2001 From: Fabien Maussion Date: Wed, 10 May 2017 08:57:08 +0200 Subject: [PATCH 1/3] add bottleneck --- .travis.yml | 2 ++ ci/requirements-py36-bn.yml | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 ci/requirements-py36-bn.yml diff --git a/.travis.yml b/.travis.yml index b7c35231867..03ff09065cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,8 @@ matrix: env: CONDA_ENV=py36-pandas-dev - python: 3.6 env: CONDA_ENV=py36-condaforge-rc + - python: 3.6 + env: CONDA_ENV=py36-bn allow_failures: - python: 3.6 env: diff --git a/ci/requirements-py36-bn.yml b/ci/requirements-py36-bn.yml new file mode 100644 index 00000000000..8e2fd98cfcf --- /dev/null +++ b/ci/requirements-py36-bn.yml @@ -0,0 +1,21 @@ +name: test_env +channels: + - conda-forge +dependencies: + - python=3.6 + - dask + - distributed + - h5py + - h5netcdf + - matplotlib + - netcdf4 + - pytest + - numpy + - pandas + - scipy + - seaborn + - toolz + - pip: + - git+https://github.com/kwgoodman/bottleneck.git + - coveralls + - pytest-cov From 9e5e0085f2096be287917d122a4325cdfd2b912e Mon Sep 17 00:00:00 2001 From: Fabien Maussion Date: Wed, 10 May 2017 22:51:39 +0200 Subject: [PATCH 2/3] add to allow failure --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 03ff09065cb..55cc13331d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,8 @@ matrix: env: CONDA_ENV=py36-pandas-dev - python: 3.6 env: CONDA_ENV=py36-condaforge-rc + - python: 3.6 + env: CONDA_ENV=py36-bn before_install: - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then From 1ba2af963cd918bf79d28eb8a335f0375b616007 Mon Sep 17 00:00:00 2001 From: Fabien Maussion Date: Wed, 10 May 2017 23:54:28 +0200 Subject: [PATCH 3/3] change name --- .travis.yml | 8 ++++---- ...s-py36-bn.yml => requirements-py36-bottleneck-dev.yml} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename ci/{requirements-py36-bn.yml => requirements-py36-bottleneck-dev.yml} (100%) diff --git a/.travis.yml b/.travis.yml index 55cc13331d2..8799944f3cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,9 +38,9 @@ matrix: - python: 3.6 env: CONDA_ENV=py36-pandas-dev - python: 3.6 - env: CONDA_ENV=py36-condaforge-rc + env: CONDA_ENV=py36-bottleneck-dev - python: 3.6 - env: CONDA_ENV=py36-bn + env: CONDA_ENV=py36-condaforge-rc allow_failures: - python: 3.6 env: @@ -60,9 +60,9 @@ matrix: - python: 3.6 env: CONDA_ENV=py36-pandas-dev - python: 3.6 - env: CONDA_ENV=py36-condaforge-rc + env: CONDA_ENV=py36-bottleneck-dev - python: 3.6 - env: CONDA_ENV=py36-bn + env: CONDA_ENV=py36-condaforge-rc before_install: - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then diff --git a/ci/requirements-py36-bn.yml b/ci/requirements-py36-bottleneck-dev.yml similarity index 100% rename from ci/requirements-py36-bn.yml rename to ci/requirements-py36-bottleneck-dev.yml