Fix CI with scikit-learn related fixes (#157)

Author: rth

.travis.yml

@@ -11,6 +11,7 @@ env:
     - CIBW_BEFORE_BUILD="pip install numpy==1.17.3 scipy==1.3.2 cython==0.29.14 setuptools"
     - CIBW_TEST_REQUIRES="pytest scikit-learn gstools"
     - CIBW_TEST_COMMAND="pytest -v {project}/tests"
+    - OMP_NUM_THREADS=2
 
 before_install:
   - |

examples/krige_cv.py

@@ -8,7 +8,7 @@
 
 import numpy as np
 from pykrige.rk import Krige
-from pykrige.compat import GridSearchCV
+from sklearn.model_selection import GridSearchCV
 
 
 # 2D Kring param opt
@@ -20,7 +20,7 @@
     # "weight": [True, False]
 }
 
-estimator = GridSearchCV(Krige(), param_dict, verbose=True)
+estimator = GridSearchCV(Krige(), param_dict, verbose=True, return_train_score=True)
 
 # dummy data
 X = np.random.randint(0, 400, size=(100, 2)).astype(float)

pykrige/compat.py

@@ -1,7 +1,6 @@
 # coding: utf-8
 # pylint: disable= invalid-name,  unused-import
 """For compatibility"""
-import inspect
 from functools import partial
 
 
@@ -11,12 +10,6 @@
     from sklearn.model_selection import train_test_split
 
     SKLEARN_INSTALLED = True
-    arg_spec = inspect.getfullargspec(GridSearchCV)[0]
-    # https://stackoverflow.com/a/56618067/6696397
-    if "return_train_score" in arg_spec:
-        GridSearchCV = partial(GridSearchCV, return_train_score=True)
-    if "iid" in arg_spec:
-        GridSearchCV = partial(GridSearchCV, iid=False)
 
 except ImportError:
     SKLEARN_INSTALLED = False

tests/test_api.py

@@ -1,10 +1,10 @@
 from itertools import product
 
 import numpy as np
+import pytest
 
 from pykrige.rk import Krige
 from pykrige.rk import threed_krige
-from pykrige.compat import GridSearchCV
 
 
 def _method_and_vergiogram():
@@ -15,6 +15,9 @@ def _method_and_vergiogram():
 
 def test_krige():
     # dummy data
+    pytest.importorskip("sklearn")
+    from sklearn.model_selection import GridSearchCV
+
     np.random.seed(1)
     X = np.random.randint(0, 400, size=(20, 3)).astype(float)
     y = 5 * np.random.rand(20)
@@ -28,6 +31,7 @@ def test_krige():
             n_jobs=-1,
             pre_dispatch="2*n_jobs",
             verbose=False,
+            return_train_score=True,
             cv=5,
         )
         # run the gridsearch