REL: allow Numpy >= 1.13, closes #1085

odlgroup · Oct 2, 2017 · 62272ad · 62272ad
1 parent 3bbb741
commit 62272ad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
@@ -1,3 +1,3 @@
 future >= 0.14
-numpy >= 1.9, < 1.13
+numpy >= 1.9
 scipy >= 0.14