PKG/MNT Update scikit-learn to v0.22 (#783)

packages/scikit-learn/meta.yaml

@@ -1,13 +1,13 @@
 package:
   name: scikit-learn
-  version: 0.20.1
+  version: 0.22.2
 
 source:
-  url: https://github.com/scikit-learn/scikit-learn/archive/0.20.1.tar.gz
-  sha256: 618feea121c59a52ea459d6af7bc179344ca345775b04bd60e96740e9df75960
+  url: https://github.com/scikit-learn/scikit-learn/archive/0.22.2.tar.gz
+  sha256: 54ae27be30ef26718c9e517c4c8f23b6af26c66e52cf16d38799ba4262d4fd3b
 
   patches:
-   - patches/use-site-joblib.patch
+    - patches/disable-openmp.patch
 
 build:
   cflags: -Wno-implicit-function-declaration

packages/scikit-learn/patches/disable-openmp.patch

@@ -0,0 +1,22 @@
+diff --git a/sklearn/_build_utils/__init__.py b/sklearn/_build_utils/__init__.py
+index 8c57982ca..b8eb93545 100644
+--- a/sklearn/_build_utils/__init__.py
++++ b/sklearn/_build_utils/__init__.py
+@@ -47,7 +47,7 @@ def cythonize_extensions(top_path, config):
+ 
+     # Fast fail before cythonization if compiler fails compiling basic test
+     # code even without OpenMP
+-    basic_check_build()
++    # basic_check_build()
+ 
+     # check simple compilation with OpenMP. If it fails scikit-learn will be
+     # built without OpenMP and the test test_openmp_supported in the test suite
+@@ -61,7 +61,7 @@ def cythonize_extensions(top_path, config):
+     #   cython build-time variable passed to the cythonize() call.
+     # - Then in the build_ext subclass defined in the top-level setup.py file
+     #   to actually build the compiled extensions with OpenMP flags if needed.
+-    sklearn._OPENMP_SUPPORTED = check_openmp_support()
++    sklearn._OPENMP_SUPPORTED = False  # check_openmp_support()
+ 
+     n_jobs = 1
+     with contextlib.suppress(ImportError):

packages/scikit-learn/patches/use-site-joblib.patch

@@ -1,19 +0,0 @@
-commit 55cfffe8243d7d85dc6f8d14f045cee8a4e8b0ae
-Author: Roman Yurchak <rth.yurchak@pm.me>
-Date:   Mon Dec 3 22:09:46 2018 +0100
-
-    Use site joblib
-
-diff --git a/sklearn/utils/_joblib.py b/sklearn/utils/_joblib.py
-index c3df15e91..b9f218ef1 100644
---- a/sklearn/utils/_joblib.py
-+++ b/sklearn/utils/_joblib.py
-@@ -5,7 +5,7 @@ import os as _os
- import warnings as _warnings
- 
- # An environment variable to use the site joblib
--if _os.environ.get('SKLEARN_SITE_JOBLIB', False):
-+if True:
-     with _warnings.catch_warnings():
-         _warnings.simplefilter("ignore")
-         # joblib imports may raise DeprecationWarning on certain Python