From 3c09d4840951825f7df19f6d688ad9aeafce85ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mihai=20Capot=C4=83?= <mihai@mihaic.ro>
Date: Tue, 10 Dec 2019 13:01:37 -0800
Subject: [PATCH 1/2] dev: Pin scikit-learn <0.22 to fix fcma test

See issue #448.

Also, pin NumPy in `setup_requires` as well.
---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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',

From 060e7c02319c367d0a56086ab13cc8ba44b1740a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mihai=20Capot=C4=83?= <mihai@mihaic.ro>
Date: Tue, 10 Dec 2019 16:57:09 -0800
Subject: [PATCH 2/2] Add explicit MPICH dependency for Jenkins

Required for compatibility with our testing infrastructure.
---
 .conda/bin/jenkins-server-customization | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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