skbase deps

skpro/benchmarking/evaluate.py

@@ -10,9 +10,9 @@
 
 import numpy as np
 import pandas as pd
+from skbase.utils.dependencies import _check_soft_dependencies
 
 from skpro.utils.parallel import parallelize
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 
 def _split(X, y, C, train, test):

skpro/benchmarking/tests/test_evaluate.py

@@ -8,6 +8,7 @@
 import numpy as np
 import pandas as pd
 import pytest
+from skbase.utils.dependencies import _check_soft_dependencies
 from sklearn.datasets import load_diabetes
 from sklearn.linear_model import LinearRegression
 from sklearn.model_selection import KFold, ShuffleSplit
@@ -16,7 +17,6 @@
 from skpro.metrics import CRPS, EmpiricalCoverage, LogLoss, PinballLoss
 from skpro.regression.residual import ResidualDouble
 from skpro.tests.test_switch import run_test_module_changed
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 
 def _check_evaluate_output(out, cv, y, scoring):

skpro/datatypes/_registry.py

@@ -194,7 +194,7 @@ def scitype_to_mtype(scitype: str, softdeps: str = "exclude"):
         return mtypes
 
     if softdeps == "present":
-        from skpro.utils.validation._dependencies import _check_soft_dependencies
+        from skbase.utils.dependencies import _check_soft_dependencies
 
         def present(x):
             """Return True if x has satisfied soft dependency or has no soft dep."""

skpro/datatypes/_table/_convert.py

@@ -32,11 +32,11 @@
 
 import numpy as np
 import pandas as pd
+from skbase.utils.dependencies import _check_soft_dependencies
 
 from skpro.datatypes._base import BaseConverter
 from skpro.datatypes._convert_utils._convert import _extend_conversions
 from skpro.datatypes._table._registry import MTYPE_LIST_TABLE
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 ##############################################################
 # methods to convert one machine type to another machine type

skpro/datatypes/tests/test_lookup.py

@@ -3,6 +3,7 @@
 __author__ = ["fkiraly"]
 
 import pytest
+from skbase.utils.dependencies import _check_soft_dependencies
 
 from skpro.datatypes._registry import (
     MTYPE_REGISTER,
@@ -11,7 +12,6 @@
     scitype_to_mtype,
 )
 from skpro.tests.test_switch import run_test_module_changed
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 MTYPE_SCITYPE_PAIRS = [(k[0], k[1]) for k in MTYPE_REGISTER]
 

skpro/datatypes/tests/test_polars.py

@@ -2,11 +2,11 @@
 
 import pandas as pd
 import pytest
+from skbase.utils.dependencies import _check_soft_dependencies
 from sklearn.datasets import load_diabetes
 from sklearn.model_selection import train_test_split
 
 from skpro.tests.test_switch import run_test_module_changed
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 if _check_soft_dependencies(["polars", "pyarrow"], severity="none"):
     import polars as pl

skpro/distributions/base/_base.py

@@ -9,13 +9,13 @@
 
 import numpy as np
 import pandas as pd
-
-from skpro.base import BaseObject
-from skpro.utils.validation._dependencies import (
+from skbase.utils.dependencies import (
     _check_estimator_deps,
     _check_soft_dependencies,
 )
 
+from skpro.base import BaseObject
+
 
 class BaseDistribution(BaseObject):
     """Base probability distribution."""

skpro/distributions/tests/test_proba_basic.py

@@ -7,9 +7,9 @@
 import numpy as np
 import pandas as pd
 import pytest
+from skbase.utils.dependencies import _check_soft_dependencies
 
 from skpro.tests.test_switch import run_test_module_changed
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 
 @pytest.mark.skipif(

skpro/regression/base/_base.py

@@ -3,14 +3,15 @@
 
 import numpy as np
 import pandas as pd
-
-from skpro.base import BaseEstimator
-from skpro.datatypes import check_is_error_msg, check_is_mtype, convert
-from skpro.utils.validation._dependencies import (
+from skbase.utils.dependencies import (
     _check_estimator_deps,
     _check_soft_dependencies,
 )
 
+from skpro.base import BaseEstimator
+from skpro.datatypes import check_is_error_msg, check_is_mtype, convert
+
+
 # allowed input mtypes
 # include mtypes that are core dependencies
 ALLOWED_MTYPES = [

skpro/regression/bayesian.py

@@ -8,8 +8,9 @@
 # copyright: skpro developers
 __author__ = ["meraldoantonio"]
 
+from skbase.utils.dependencies import _check_soft_dependencies
+
 from skpro.regression.base import BaseProbaRegressor
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 
 class BayesianLinearRegressor(BaseProbaRegressor):

skpro/regression/compose/_pipeline.py

@@ -199,11 +199,11 @@ def get_test_params(cls, parameter_set="default"):
             `MyClass(**params)` or `MyClass(**params[i])` creates a valid test instance.
             `create_test_instance` uses the first (or only) dictionary in `params`
         """
+        from skbase.utils.dependencies import _check_estimator_deps
         from sklearn.preprocessing import StandardScaler
 
         from skpro.regression.residual import ResidualDouble
         from skpro.survival.coxph import CoxPH
-        from skpro.utils.validation._dependencies import _check_estimator_deps
 
         params = []
 

skpro/regression/online/_dont_refit.py

@@ -89,11 +89,11 @@ def get_test_params(cls, parameter_set="default"):
             `MyClass(**params)` or `MyClass(**params[i])` creates a valid test instance.
             `create_test_instance` uses the first (or only) dictionary in `params`
         """
+        from skbase.utils.dependencies import _check_estimator_deps
         from sklearn.linear_model import LinearRegression, Ridge
 
         from skpro.regression.residual import ResidualDouble
         from skpro.survival.coxph import CoxPH
-        from skpro.utils.validation._dependencies import _check_estimator_deps
 
         regressor = ResidualDouble(LinearRegression())
 

skpro/regression/online/_refit.py

@@ -164,11 +164,11 @@ def get_test_params(cls, parameter_set="default"):
             `MyClass(**params)` or `MyClass(**params[i])` creates a valid test instance.
             `create_test_instance` uses the first (or only) dictionary in `params`
         """
+        from skbase.utils.dependencies import _check_estimator_deps
         from sklearn.linear_model import LinearRegression, Ridge
 
         from skpro.regression.residual import ResidualDouble
         from skpro.survival.coxph import CoxPH
-        from skpro.utils.validation._dependencies import _check_estimator_deps
 
         regressor = ResidualDouble(LinearRegression())
 

skpro/regression/online/_refit_every.py

@@ -143,11 +143,11 @@ def get_test_params(cls, parameter_set="default"):
             `MyClass(**params)` or `MyClass(**params[i])` creates a valid test instance.
             `create_test_instance` uses the first (or only) dictionary in `params`
         """
+        from skbase.utils.dependencies import _check_estimator_deps
         from sklearn.linear_model import LinearRegression, Ridge
 
         from skpro.regression.residual import ResidualDouble
         from skpro.survival.coxph import CoxPH
-        from skpro.utils.validation._dependencies import _check_estimator_deps
 
         regressor = ResidualDouble(LinearRegression())
 

skpro/tests/test_switch.py

@@ -162,9 +162,10 @@ class for which to determine whether it should be tested
 
         If multiple reasons are present, the first one in the above list is returned.
     """
+    from skbase.utils.dependencies import _check_estimator_deps
+
     from skpro.tests.test_all_estimators import ONLY_CHANGED_MODULES
     from skpro.utils.git_diff import get_packages_with_changed_specs, is_class_changed
-    from skpro.utils.validation._dependencies import _check_estimator_deps
 
     PACKAGE_REQ_CHANGED = get_packages_with_changed_specs()
 

skpro/tests/tests/test_test_utils.py

@@ -1,8 +1,9 @@
 """Tests for the test utilities."""
 
+from skbase.utils.dependencies import _check_estimator_deps
+
 from skpro.tests._config import EXCLUDE_ESTIMATORS
 from skpro.tests.test_switch import run_test_for_class
-from skpro.utils.validation._dependencies import _check_estimator_deps
 
 
 def test_exclude_estimators():

skpro/utils/_maint/tests/test_show_versions.py

@@ -1,13 +1,13 @@
 """Tests for the show_versions utility."""
 import pathlib
 import uuid
+from skbase.utils.dependencies import _check_soft_dependencies
 
 from skpro.utils._maint._show_versions import (
     DEFAULT_DEPS_TO_SHOW,
     _get_deps_info,
     show_versions,
 )
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 
 def test_show_versions_runs():

skpro/utils/deep_equals/_deep_equals.py

@@ -8,8 +8,8 @@
 """
 from skbase.utils.deep_equals._common import _make_ret
 from skbase.utils.deep_equals._deep_equals import deep_equals as _deep_equals
+from skbase.utils.dependencies import _check_soft_dependencies
 
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 __author__ = ["fkiraly"]
 __all__ = ["deep_equals"]

skpro/utils/estimator_checks.py

@@ -3,7 +3,7 @@
 __author__ = ["fkiraly"]
 __all__ = ["check_estimator"]
 
-from skpro.utils.validation._dependencies import _check_soft_dependencies
+from skbase.utils.dependencies import _check_soft_dependencies
 
 
 def check_estimator(

skpro/utils/parallel.py

@@ -155,7 +155,7 @@ def _get_parallel_test_fixtures():
     Returns a list of parameter fixtures, where each fixture
     is a dict with keys "backend" and "backend_params".
     """
-    from skpro.utils.validation._dependencies import _check_soft_dependencies
+    from skbase.utils.dependencies import _check_soft_dependencies
 
     fixtures = []
 

skpro/utils/plotting.py

@@ -2,7 +2,7 @@
 import numpy as np
 import pandas as pd
 
-from skpro.utils.validation._dependencies import _check_soft_dependencies
+from skbase.utils.dependencies import _check_soft_dependencies
 
 __authors__ = ["fkiraly", "frthjf"]
 

skpro/utils/tests/test_plots.py

@@ -2,9 +2,9 @@
 # copyright: skpro developers, BSD-3-Clause License (see LICENSE file)
 
 import pytest
+from skbase.utils.dependencies import _check_soft_dependencies
 
 from skpro.tests.test_switch import run_test_module_changed
-from skpro.utils.validation._dependencies import _check_soft_dependencies
 
 
 @pytest.mark.skipif(