Skip to content

Commit

Permalink
Updated imports
Browse files Browse the repository at this point in the history
Assume Scikit-Learn 1.0 or newer.
  • Loading branch information
vruusmann committed Mar 14, 2024
1 parent fe64b46 commit 4e93796
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 19 deletions.
12 changes: 2 additions & 10 deletions sklearn2pmml/__init__.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
from pandas import CategoricalDtype
from sklearn.base import BaseEstimator
from sklearn.compose import ColumnTransformer
from sklearn.exceptions import NotFittedError
try:
from sklearn.compose import ColumnTransformer
except ImportError:
class ColumnTransformer:
pass
try:
from sklearn.feature_selection._base import SelectorMixin
except ImportError:
from sklearn.feature_selection.base import SelectorMixin
from sklearn.feature_selection import SelectFromModel
from sklearn.feature_selection import SelectFromModel, SelectorMixin
from sklearn.pipeline import FeatureUnion, Pipeline
from sklearn_pandas import DataFrameMapper
from sklearn2pmml.resources import _package_classpath
Expand Down
7 changes: 2 additions & 5 deletions sklearn2pmml/ensemble/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
from sklearn.base import clone, BaseEstimator, ClassifierMixin, RegressorMixin
try:
from sklearn.linear_model import LinearRegression
from sklearn.linear_model._base import LinearClassifierMixin, LinearModel, SparseCoefMixin
except ImportError:
from sklearn.linear_model.base import LinearClassifierMixin, LinearModel, LinearRegression, SparseCoefMixin
from sklearn.linear_model import LinearRegression
from sklearn.linear_model._base import LinearClassifierMixin, LinearModel, SparseCoefMixin
from sklearn.preprocessing import OneHotEncoder
from sklearn.utils.metaestimators import _BaseComposition
from sklearn2pmml.util import eval_rows, fqn, to_expr_func, Predicate
Expand Down
5 changes: 1 addition & 4 deletions sklearn2pmml/feature_selection/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
from pandas import DataFrame
from sklearn.base import BaseEstimator
try:
from sklearn.feature_selection._base import SelectorMixin
except ImportError:
from sklearn.feature_selection.base import SelectorMixin
from sklearn.feature_selection import SelectorMixin
from sklearn.utils.validation import check_is_fitted
from sklearn2pmml.util import to_numpy

Expand Down

0 comments on commit 4e93796

Please sign in to comment.