REL: allow Numpy >= 1.13, closes #1085

odlgroup · Aug 17, 2017 · 228a680 · 228a680
1 parent d4b209e
commit 228a680
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ install:
     - conda info -a
 
     # Install dependencies and enter test environment
-    - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION "numpy<1.13" scipy future nomkl sphinx sphinx_rtd_theme pytest pytest-pep8 pytest-cov
+    - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy future nomkl sphinx sphinx_rtd_theme pytest pytest-pep8 pytest-cov
     - source activate test-environment
 
     # Some packages which are only on PyPI, not on conda

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