Compat: fix Sklearn validation bug

examples/07_regression_kriging2d.py

@@ -11,9 +11,9 @@
 from sklearn.ensemble import RandomForestRegressor
 from sklearn.linear_model import LinearRegression
 from sklearn.datasets import fetch_california_housing
+from sklearn.model_selection import train_test_split
 
 from pykrige.rk import RegressionKriging
-from pykrige.compat import train_test_split
 
 svr_model = SVR(C=0.1, gamma="auto")
 rf_model = RandomForestRegressor(n_estimators=100)

examples/10_classification_kriging2d.py

@@ -1,6 +1,6 @@
 """
 Classification kriging
-------------------
+----------------------
 
 An example of classification kriging
 """
@@ -12,9 +12,9 @@
 from sklearn.linear_model import LogisticRegression
 from sklearn.datasets import fetch_california_housing
 from sklearn.preprocessing import KBinsDiscretizer
+from sklearn.model_selection import train_test_split
 
 from pykrige.ck import ClassificationKriging
-from pykrige.compat import train_test_split
 
 svc_model = SVC(C=0.1, gamma="auto", probability=True)
 rf_model = RandomForestClassifier(n_estimators=100)

pykrige/ck.py

@@ -1,12 +1,13 @@
 # coding: utf-8
+"""Classification Kriging."""
+import numpy as np
 from pykrige.compat import Krige, validate_sklearn, check_sklearn_model
 
 validate_sklearn()
 
-from sklearn.metrics import r2_score, accuracy_score
+from sklearn.metrics import accuracy_score
 from sklearn.svm import SVC
 from sklearn.preprocessing import OneHotEncoder
-import numpy as np
 from scipy.linalg import helmert
 
 

pykrige/compat.py

@@ -1,16 +1,14 @@
 # coding: utf-8
 # pylint: disable= invalid-name,  unused-import
-"""For compatibility"""
-from functools import partial
-
+"""For compatibility."""
 from pykrige.uk3d import UniversalKriging3D
 from pykrige.ok3d import OrdinaryKriging3D
 from pykrige.uk import UniversalKriging
 from pykrige.ok import OrdinaryKriging
 
 # sklearn
 try:
-    from sklearn.model_selection import GridSearchCV
+    # keep train_test_split here for backward compatibility
     from sklearn.model_selection import train_test_split
     from sklearn.base import RegressorMixin, ClassifierMixin, BaseEstimator
 
@@ -19,6 +17,18 @@
 except ImportError:
     SKLEARN_INSTALLED = False
 
+    train_test_split = None
+
+    class RegressorMixin:
+        """Mock RegressorMixin."""
+
+    class ClassifierMixin:
+        """Mock ClassifierMixin."""
+
+    class BaseEstimator:
+        """Mock BaseEstimator."""
+
+
 krige_methods = {
     "ordinary": OrdinaryKriging,
     "universal": UniversalKriging,
@@ -65,7 +75,7 @@
 
 
 class SklearnException(Exception):
-    pass
+    """Exception for missing scikit-learn."""
 
 
 def validate_method(method):
@@ -77,6 +87,7 @@ def validate_method(method):
 
 
 def validate_sklearn():
+    """Validate presence of scikit-learn."""
     if not SKLEARN_INSTALLED:
         raise SklearnException(
             "sklearn needs to be installed in order to use this module"

pykrige/rk.py

@@ -1,9 +1,10 @@
 # coding: utf-8
+"""Regression Kriging."""
 from pykrige.compat import Krige, validate_sklearn, check_sklearn_model
 
 validate_sklearn()
 
-from sklearn.metrics import r2_score, accuracy_score
+from sklearn.metrics import r2_score
 from sklearn.svm import SVR
 
 

tests/test_classification_krige.py

@@ -10,7 +10,7 @@
     from sklearn.datasets import fetch_california_housing
     from sklearn.ensemble import RandomForestClassifier
     from sklearn.preprocessing import KBinsDiscretizer
-    from pykrige.compat import train_test_split
+    from sklearn.model_selection import train_test_split
 
     SKLEARN_INSTALLED = True
 except ImportError:

tests/test_regression_krige.py

@@ -11,7 +11,7 @@
     from sklearn.linear_model import ElasticNet, Lasso
     from sklearn.ensemble import RandomForestRegressor
     from sklearn.linear_model import LinearRegression
-    from pykrige.compat import train_test_split
+    from sklearn.model_selection import train_test_split
 
     SKLEARN_INSTALLED = True
 except ImportError: