diff --git a/.travis.yml b/.travis.yml index e3baa07e064..3edcd20ff1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,13 @@ language: python matrix: include: - python: 2.7 - env: NUMPY_VERSION=1.12 + env: NUMPY_VERSION=1.13 - python: 3.6 - env: NUMPY_VERSION=1.12 COVERALLS=true BUILD_DOCS=true + env: NUMPY_VERSION=1.12 + - python: 3.6 + env: NUMPY_VERSION=1.13 COVERALLS=true BUILD_DOCS=true sudo: false @@ -41,7 +43,7 @@ install: - conda info -a # Install dependencies and enter test environment. Use conda for the minimal stuff to - # make it run faster and avoid downloading bug stuff like mkl + # make it run faster and avoid downloading big stuff like mkl - conda create -n testenv python=$TRAVIS_PYTHON_VERSION nomkl pywavelets - source activate testenv # We avoid annoying issues with building pyfftw wheels by using a conda-forge version diff --git a/conda/meta.yaml b/conda/meta.yaml index b8ef37607c1..d9bef87e972 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -19,13 +19,13 @@ requirements: - setuptools - nomkl # [not win] - future >=0.14 - - numpy >=1.9,<1.13 + - numpy >=1.9 - scipy >=0.14 run: - python - future >=0.14 - nomkl # [not win] - - numpy >=1.9,<1.13 + - numpy >=1.9 - scipy >=0.14 - matplotlib - pytest >=3.0.3 diff --git a/requirements.txt b/requirements.txt index 73363e9ec90..446b307981f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ future >= 0.14 -numpy >= 1.9, < 1.13 +numpy >= 1.9 scipy >= 0.14