diff --git a/.conda/bin/jenkins-server-customization b/.conda/bin/jenkins-server-customization index ed46b4e48..7a7daae62 100644 --- a/.conda/bin/jenkins-server-customization +++ b/.conda/bin/jenkins-server-customization @@ -3,5 +3,5 @@ # TensorFlow 2.0 breaks Pymanopt: # https://github.com/pymanopt/pymanopt/issues/86 -conda install --yes mpi4py tensorflow\<2 scipy\<1.3 numpy\<1.17 +conda install --yes mpi4py mpich\<3.3 tensorflow\<2 scipy\<1.3 numpy\<1.17 module unload gcc diff --git a/setup.py b/setup.py index 8fc5365b0..6b7494d98 100644 --- a/setup.py +++ b/setup.py @@ -116,7 +116,7 @@ def finalize_options(self): use_scm_version=True, setup_requires=[ 'cython', - 'numpy', + 'numpy<1.17', 'pybind11>=1.7', 'setuptools_scm', ], @@ -128,7 +128,7 @@ def finalize_options(self): 'nitime', # https://github.com/numpy/numpy/issues/14189 'numpy<1.17', - 'scikit-learn[alldeps]>=0.18', + 'scikit-learn[alldeps]>=0.18,<0.22', # See https://github.com/scipy/scipy/pull/8082 # and https://github.com/pymanopt/pymanopt/issues/77 'scipy!=1.0.0,<1.3.0',