Merge pull request #177 from decargroup/bugfix/176-fix-scikit-learn-i…

…mport-method-resolution-order Fix `sklearn` method resolution order
decargroup · Sep 26, 2024 · 21073ad · 21073ad
2 parents fdf5099 + bbd875c
commit 21073ad
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/pykoop/kernel_approximation.py b/pykoop/kernel_approximation.py
@@ -16,8 +16,8 @@
 
 
 class KernelApproximation(
-        sklearn.base.BaseEstimator,
         sklearn.base.TransformerMixin,
+        sklearn.base.BaseEstimator,
         metaclass=abc.ABCMeta,
 ):
     """Base class for all kernel approximations.

diff --git a/pykoop/koopman_pipeline.py b/pykoop/koopman_pipeline.py
@@ -22,8 +22,8 @@
 
 
 class KoopmanLiftingFn(
-        sklearn.base.BaseEstimator,
         sklearn.base.TransformerMixin,
+        sklearn.base.BaseEstimator,
         metaclass=abc.ABCMeta,
 ):
     """Base class for Koopman lifting functions.
@@ -1138,9 +1138,11 @@ def _validate_parameters(self) -> None:
         raise NotImplementedError()
 
 
-class KoopmanRegressor(sklearn.base.BaseEstimator,
-                       sklearn.base.RegressorMixin,
-                       metaclass=abc.ABCMeta):
+class KoopmanRegressor(
+        sklearn.base.RegressorMixin,
+        sklearn.base.BaseEstimator,
+        metaclass=abc.ABCMeta,
+):
     """Base class for Koopman regressors.
 
     All attributes with a trailing underscore are set by :func:`fit`.
@@ -1628,6 +1630,7 @@ def _more_tags(self):
         return {
             'multioutput': True,
             'multioutput_only': True,
+            'requires_y': False,
         }
 
 

diff --git a/pykoop/lmi_regressors.py b/pykoop/lmi_regressors.py
@@ -103,6 +103,7 @@ def _more_tags(self):
         return {
             'multioutput': True,
             'multioutput_only': True,
+            'requires_y': False,
             '_xfail_checks': {
                 'check_fit_idempotent': reason,
             }
@@ -2155,7 +2156,7 @@ def _create_problem_b(self, U: np.ndarray) -> picos.Problem:
         return problem_b
 
 
-class LmiHinfZpkMeta(sklearn.base.BaseEstimator, sklearn.base.RegressorMixin):
+class LmiHinfZpkMeta(sklearn.base.RegressorMixin, sklearn.base.BaseEstimator):
     """Meta-estimator where H-infinity weight is specified in ZPK format.
 
     H-infinity regularization weights must normally be specified in
@@ -2375,6 +2376,7 @@ def _more_tags(self):
         return {
             'multioutput': True,
             'multioutput_only': True,
+            'requires_y': False,
         }
 
 

diff --git a/pykoop/regressors.py b/pykoop/regressors.py
@@ -402,6 +402,7 @@ def _more_tags(self):
         return {
             'multioutput': True,
             'multioutput_only': True,
+            'requires_y': False,
             '_xfail_checks': {
                 'check_estimators_dtypes': reason,
                 'check_fit_score_takes_y': reason,
@@ -504,6 +505,7 @@ def _more_tags(self):
         return {
             'multioutput': True,
             'multioutput_only': True,
+            'requires_y': False,
             # Allow a bad score since the ``coef_`` matrix will be filled with
             # zeros, and we just care to test ``scikit-learn`` API compliance.
             'poor_score': True,