8000 MNT fix linter issues related to multioutput (#24143) · scikit-learn/scikit-learn@6b678c0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6b678c0

Browse files
adrinjalaliadrinjalali
authored
MNT fix linter issues related to multioutput (#24143)
1 parent 4d062fb commit 6b678c0

File tree

2 files changed

+53
-42
lines changed

2 files changed

+53
-42
lines changed

‎sklearn/multioutput.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,31 @@
1313
# Author: James Ashton Nichols <james.ashton.nichols@gmail.com>
1414
#
1515
# License: BSD 3 clause
16+
17+
18+
from abc import ABCMeta, abstractmethod
1619
from numbers import Integral
1720

1821
import numpy as np
1922
import scipy.sparse as sp
2023
from joblib import Parallel
2124

22-
from abc import ABCMeta, abstractmethod
23-
from .base import BaseEstimator, clone, MetaEstimatorMixin
24-
from .base import RegressorMixin, ClassifierMixin, is_classifier
25-
from .model_selection import cross_val_predict
26-
from .utils import check_random_state, _print_elapsed_time
27-
from .utils.metaestimators import available_if
28-
from .utils import check_random_state
29-
from .utils.validation import check_is_fitted
30-
from .utils.multiclass import check_classification_targets
31-
from .utils.validation import (
32-
check_is_fitted,
33-
has_fit_parameter,
34-
_check_fit_params,
25+
from .base import (
26+
BaseEstimator,
27+
ClassifierMixin,
28+
MetaEstimatorMixin,
29+
RegressorMixin,
30+
clone,
31+
is_classifier,
3532
)
36-
from .utils.fixes import delayed
33+
from .model_selection import cross_val_predict
34+
from .utils import _print_elapsed_time, check_random_state
3735
from .utils._param_validation import HasMethods
36+
from .utils.fixes import delayed
3837
from .utils.metadata_routing import MetadataRouter, MethodMapping, process_routing
38+
from .utils.metaestimators import available_if
39+
from .utils.multiclass import check_classification_targets
40+
from .utils.validation import check_is_fitted
3941

4042
__all__ = [
4143
"MultiOutputRegressor",
@@ -83,7 +85,6 @@ def _check(self):
8385

8486

8587
class _MultiOutputEstimator(MetaEstimatorMixin, BaseEstimator, metaclass=ABCMeta):
86-
8788
_parameter_constraints = {
8889
"estimator": [HasMethods(["fit", "predict"])],
8990
"n_jobs": [Integral, None],

‎sklearn/tests/test_multioutput.py

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,52 @@
1-
import pytest
21
import re
2+
33
import numpy as np
4+
import pytest
45
import scipy.sparse as sp
56
from joblib import cpu_count
6-
import re
77

8-
from sklearn.utils._testing import assert_almost_equal
9-
from sklearn.utils._testing import assert_array_equal
10-
from sklearn.utils._testing import assert_array_almost_equal
118
from sklearn import datasets
12-
from sklearn.base import clone
13-
from sklearn.datasets import make_classification
14-
from sklearn.datasets import load_linnerud
15-
from sklearn.datasets import make_multilabel_classification
16-
from sklearn.datasets import make_regression
17-
from sklearn.ensemble import GradientBoostingRegressor, RandomForestClassifier
9+
from sklearn.base import ClassifierMixin, clone
10+
from sklearn.datasets import (
11+
load_linnerud,
12+
make_classification,
13+
make_multilabel_classification,
14+
make_regression,
15+
)
16+
from sklearn.ensemble import (
17+
GradientBoostingRegressor,
18+
RandomForestClassifier,
19+
StackingRegressor,
20+
)
1821
from sklearn.exceptions import NotFittedError
19-
from sklearn.linear_model import Lasso
20-
from sklearn.linear_model import LogisticRegression
21-
from sklearn.linear_model import OrthogonalMatchingPursuit
22-
from sklearn.linear_model import Ridge
23-
from sklearn.linear_model import SGDClassifier
24-
from sklearn.linear_model import SGDRegressor
25-
from sklearn.linear_model import LinearRegression
22+
from sklearn.impute import SimpleImputer
23+
from sklearn.linear_model import (
24+
Lasso,
25+
LinearRegression,
26+
LogisticRegression,
27+
OrthogonalMatchingPursuit,
28+
Ridge,
29+
SGDClassifier,
30+
SGDRegressor,
31+
)
2632
from sklearn.metrics import jaccard_score, mean_squared_error
33+
from sklearn.model_selection import GridSearchCV, train_test_split
2734
from sklearn.multiclass import OneVsRestClassifier
28-
from sklearn.multioutput import ClassifierChain, RegressorChain
29-
from sklearn.multioutput import MultiOutputClassifier
30-
from sklearn.multioutput import MultiOutputRegressor
35+
from sklearn.multioutput import (
36+
ClassifierChain,
37+
MultiOutputClassifier,
38+
MultiOutputRegressor,
39+
RegressorChain,
40+
)
41+
from sklearn.pipeline import make_pipeline
3142
from sklearn.svm import LinearSVC
3243
from sklearn.tree import DecisionTreeClassifier
33-
from sklearn.base import ClassifierMixin
3444
from sklearn.utils import shuffle
35-
from sklearn.model_selection import GridSearchCV, train_test_split
36-
from sklearn.dummy import DummyRegressor, DummyClassifier
37-
from sklearn.pipeline import make_pipeline
38-
from sklearn.impute import SimpleImputer
39-
from sklearn.ensemble import StackingRegressor
45+
from sklearn.utils._testing import (
46+
assert_almost_equal,
47+
assert_array_almost_equal,
48+
assert_array_equal,
49+
)
4050

4151

4252
def test_multi_target_regression():

0 commit comments

Comments
 (0)
0