Skip to content

Commit

Permalink
REL: allow Numpy >= 1.13, closes #1085
Browse files Browse the repository at this point in the history
  • Loading branch information
Holger Kohr committed Sep 27, 2017
1 parent 6fbeaa9 commit a92259f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
future >= 0.14
numpy >= 1.9, < 1.13
numpy >= 1.9
scipy >= 0.14

0 comments on commit a92259f

Please sign in to comment.