Skip to content

Commit

Permalink
Update numpy requirement to 1.16.6
Browse files Browse the repository at this point in the history
Force Travis to use modern versions of Numpy as well - this will not
actually be an issue in distributed code where users can ensure that
conda is not doing something silly, and existing overhauls to the Travis
machinery in master fix this already anyway.
  • Loading branch information
jakelishman committed Feb 19, 2021
1 parent 5b7c279 commit 5e5cf3b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
15 changes: 6 additions & 9 deletions .travis.yml
Expand Up @@ -56,7 +56,7 @@ _stage_linux_38: &stage_linux_38
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- source activate test-environment
- conda install numpy scipy pytest pytest-cov cython coveralls
- conda install 'numpy>=1.16.6,<1.20' scipy pytest pytest-cov cython coveralls
- python setup.py install


Expand All @@ -74,8 +74,7 @@ _stage_linux_no_cython: &stage_linux_no_cython
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- source activate test-environment
- conda install -c conda-forge nomkl blas=*=openblas numpy scipy pytest pytest-cov
- conda install -c conda-forge cython --freeze-installed
- conda install blas=*=openblas 'numpy>=1.16.6,<1.20' scipy pytest pytest-cov cython
- conda list
- python setup.py install
- conda uninstall cython
Expand All @@ -94,7 +93,7 @@ _stage_linux_38_openblas: &stage_linux_38_openblas
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- source activate test-environment
- conda install nomkl blas=*=openblas numpy scipy pytest pytest-cov cython
- conda install nomkl blas=*=openblas 'numpy>=1.16.6,<1.20' scipy pytest pytest-cov cython
- python setup.py install

_stage_linux_omp: &stage_linux_omp
Expand All @@ -111,7 +110,7 @@ _stage_linux_omp: &stage_linux_omp
- conda info -a
- conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION
- source activate test-environment
- conda install mkl blas=*=mkl numpy 'scipy<1.5' pytest pytest-cov cython coveralls
- conda install mkl blas=*=mkl 'numpy>=1.16.6,<1.20' 'scipy<1.5' pytest pytest-cov cython coveralls
- python setup.py install --with-openmp
after_success:
- coveralls
Expand All @@ -138,8 +137,7 @@ _stage_osx_37: &stage_osx_37
- conda info -a
- conda create -q -n test-environment python=3.7
- source activate test-environment
# - conda install mkl blas=*=mkl numpy scipy pytest pytest-cov cython coveralls
- conda install nomkl blas=*=openblas numpy scipy pytest pytest-cov cython
- conda install nomkl blas=*=openblas 'numpy>=1.16.6,<1.20' scipy pytest pytest-cov cython
- python setup.py install

_stage_osx_38: &stage_osx_38
Expand All @@ -164,8 +162,7 @@ _stage_osx_38: &stage_osx_38
- conda info -a
- conda create -q -n test-environment python=3.8
- source activate test-environment
# - conda install mkl blas=*=mkl numpy scipy pytest pytest-cov cython coveralls
- conda install nomkl blas=*=openblas numpy scipy pytest pytest-cov cython
- conda install nomkl blas=*=openblas 'numpy>=1.16.6,<1.20' scipy pytest pytest-cov cython
- python setup.py install

stages:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -58,9 +58,9 @@
MICRO = 3
ISRELEASED = True
VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
REQUIRES = ['numpy (>=1.12)', 'scipy (>=1.0)', 'cython (>=0.21)']
REQUIRES = ['numpy (>=1.16.6)', 'scipy (>=1.0)', 'cython (>=0.21)']
EXTRAS_REQUIRE = {'graphics':['matplotlib(>=1.2.1)']}
INSTALL_REQUIRES = ['numpy>=1.12', 'scipy>=1.0', 'cython>=0.21']
INSTALL_REQUIRES = ['numpy>=1.16.6', 'scipy>=1.0', 'cython>=0.21']
PACKAGES = ['qutip', 'qutip/ui', 'qutip/cy', 'qutip/cy/src',
'qutip/qip', 'qutip/qip/device', 'qutip/qip/operations',
'qutip/qip/compiler',
Expand Down

0 comments on commit 5e5cf3b

Please sign in to comment.