From 5e5cf3b47bea433527271c8a8d60491d8dffe9fc Mon Sep 17 00:00:00 2001
From: Jake Lishman <jake@binhbar.com>
Date: Fri, 19 Feb 2021 14:22:27 +0000
Subject: [PATCH] Update numpy requirement to 1.16.6

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.
---
 .travis.yml | 15 ++++++---------
 setup.py    |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 726e87607e..99c5741f29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
 
 
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
diff --git a/setup.py b/setup.py
index 0bb000f22a..2ccf98425e 100755
--- a/setup.py
+++ b/setup.py
@@ -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',