more fixes for tests

Author: AndrewTanQB

skrules/datasets/credit_data.py

@@ -18,18 +18,15 @@
 
 import pandas as pd
 import numpy as np
-<<<<<<< HEAD
-from sklearn.datasets.base import get_data_home, Bunch
-=======
 
 try:
-    from sklearn.datasets.base import get_data_home, Bunch
-except ModuleNotFoundError:
+    from sklearn.datasets.base import get_data_home, Bunch, _fetch_remote, RemoteFileMetadata
+except (ModuleNotFoundError, ImportError):
+    # For scikit-learn >= 0.24 compatibility
     from sklearn.datasets import get_data_home
     from sklearn.utils import Bunch
+    from sklearn.datasets._base import _fetch_remote, RemoteFileMetadata
 
->>>>>>> aa9588c... fix typo
-from sklearn.datasets.base import _fetch_remote, RemoteFileMetadata
 from os.path import exists, join
 
 

skrules/tests/test_common.py

@@ -1,10 +1,28 @@
 from sklearn.utils.estimator_checks import check_estimator
 from skrules import SkopeRules
 from skrules.datasets import load_credit_data
+import sklearn
 
 
 def test_classifier():
-    check_estimator(SkopeRules)
+    try:
+        check_estimator(SkopeRules)
+    except TypeError:
+        # For sklearn >= 0.24.0 compatibility
+        from sklearn.utils._testing import SkipTest
+        from sklearn.utils.estimator_checks import check_sample_weights_invariance
+
+        checks = check_estimator(SkopeRules(), generate_only=True)
+        for estimator, check in checks:
+            # Here we ignore this particular estimator check because
+            # sample weights are treated differently in skope-rules
+            if check.func != check_sample_weights_invariance:
+                try:
+                    check(estimator)
+                except SkipTest as exception:
+                    # SkipTest is thrown when pandas can't be imported, or by checks
+                    # that are in the xfail_checks tag
+                    warnings.warn(str(exception), SkipTestWarning)
 
 
 def test_load_credit_data():