From 228a680052e2ce879e7db2f72188351995acc1f3 Mon Sep 17 00:00:00 2001 From: Holger Kohr Date: Wed, 16 Aug 2017 14:55:18 +0200 Subject: [PATCH] REL: allow Numpy >= 1.13, closes #1085 --- .travis.yml | 2 +- conda/meta.yaml | 4 ++-- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa47001768a..7bb8b2f964d 100644 --- 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 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