Skip to content

Commit 1acfd30

Browse files
author
Joan Massich
committed
Move import statements for codebase coherence.
1 parent dd2b0db commit 1acfd30

20 files changed

+48
-36
lines changed

imblearn/combine/tests/test_smote_enn.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
from __future__ import print_function
77

88
import numpy as np
9-
from sklearn.utils.testing import assert_allclose, assert_array_equal
109
from pytest import raises
1110

11+
from sklearn.utils.testing import assert_allclose, assert_array_equal
12+
1213
from imblearn.combine import SMOTEENN
1314
from imblearn.under_sampling import EditedNearestNeighbours
1415
from imblearn.over_sampling import SMOTE

imblearn/combine/tests/test_smote_tomek.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
from __future__ import print_function
77

88
import numpy as np
9-
from sklearn.utils.testing import assert_allclose, assert_array_equal
109
from pytest import raises
1110

11+
from sklearn.utils.testing import assert_allclose, assert_array_equal
12+
1213
from imblearn.combine import SMOTETomek
1314
from imblearn.over_sampling import SMOTE
1415
from imblearn.under_sampling import TomekLinks

imblearn/datasets/tests/test_imbalance.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
import numpy as np
1212

13-
from sklearn.datasets import load_iris
14-
from imblearn.utils.testing import warns
15-
1613
from pytest import raises
1714

15+
from sklearn.datasets import load_iris
16+
17+
from imblearn.utils.testing import warns
1818
from imblearn.datasets import make_imbalance
1919

2020
data = load_iris()

imblearn/ensemble/tests/test_balance_cascade.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
from __future__ import print_function
77

88
import numpy as np
9-
from sklearn.utils.testing import assert_array_equal
109

10+
from pytest import raises
11+
12+
from sklearn.utils.testing import assert_array_equal
1113
from sklearn.ensemble import RandomForestClassifier
1214

1315
from imblearn.ensemble import BalanceCascade
1416

15-
from pytest import raises
1617

1718
RND_SEED = 0
1819
X = np.array([[0.11622591, -0.0317206], [0.77481731, 0.60935141],

imblearn/metrics/tests/test_classification.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
import numpy as np
1212

13+
from pytest import approx, raises
14+
1315
from sklearn import datasets
1416
from sklearn import svm
1517

@@ -31,7 +33,6 @@
3133
from imblearn.metrics import make_index_balanced_accuracy
3234
from imblearn.metrics import classification_report_imbalanced
3335

34-
from pytest import approx, raises
3536
from imblearn.utils.testing import warns
3637

3738

imblearn/over_sampling/tests/test_adasyn.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
from __future__ import print_function
77

88
import numpy as np
9+
from pytest import raises
10+
911
from sklearn.utils.testing import assert_allclose, assert_array_equal
1012
from sklearn.neighbors import NearestNeighbors
1113

1214
from imblearn.over_sampling import ADASYN
1315

14-
from pytest import raises
1516

1617
RND_SEED = 0
1718
X = np.array([[0.11622591, -0.0317206], [0.77481731, 0.60935141],

imblearn/over_sampling/tests/test_smote.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
from __future__ import print_function
77

88
import numpy as np
9+
from pytest import raises
10+
911
from sklearn.utils.testing import assert_allclose, assert_array_equal
1012
from sklearn.neighbors import NearestNeighbors
1113
from sklearn.svm import SVC
1214

1315
from imblearn.over_sampling import SMOTE
1416

15-
from pytest import raises
1617

1718
RND_SEED = 0
1819
X = np.array([[0.11622591, -0.0317206], [0.77481731, 0.60935141],

imblearn/tests/test_exceptions.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
# Christos Aridas
44
# License: MIT
55

6+
from pytest import raises
67

78
from imblearn.exceptions import raise_isinstance_error
89

9-
from pytest import raises
10-
1110

1211
def test_raise_isinstance_error():
1312
var = 10.0

imblearn/tests/test_pipeline.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import time
1212

1313
import numpy as np
14+
from pytest import raises
15+
1416
from sklearn.utils.testing import assert_array_equal
1517
from sklearn.utils.testing import assert_array_almost_equal
1618
from sklearn.utils.testing import assert_allclose
@@ -30,7 +32,6 @@
3032
from imblearn.under_sampling import (RandomUnderSampler,
3133
EditedNearestNeighbours as ENN)
3234

33-
from pytest import raises
3435

3536
JUNK_FOOD_DOCS = (
3637
"the pizza pizza beer copyright",

imblearn/under_sampling/prototype_generation/tests/test_cluster_centroids.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
from collections import Counter
55

66
import numpy as np
7+
from pytest import raises
8+
79
from sklearn.utils.testing import assert_allclose
810
from sklearn.utils.testing import assert_array_equal
9-
from pytest import raises
1011

1112
from sklearn.cluster import KMeans
1213

imblearn/under_sampling/prototype_selection/tests/test_allknn.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
from __future__ import print_function
77

88
import numpy as np
9+
from pytest import raises
10+
911
from sklearn.utils.testing import assert_allclose, assert_array_equal
1012
from sklearn.neighbors import NearestNeighbors
1113
from sklearn.datasets import make_classification
1214

1315
from imblearn.under_sampling import AllKNN
1416

15-
from pytest import raises
1617

1718
RND_SEED = 0
1819
X = np.array([[-0.12840393, 0.66446571], [1.32319756, -0.13181616],

imblearn/under_sampling/prototype_selection/tests/test_edited_nearest_neighbours.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
from __future__ import print_function
77

88
import numpy as np
9-
from sklearn.utils.testing import assert_array_equal
109
from pytest import raises
1110

11+
from sklearn.utils.testing import assert_array_equal
12+
1213
from sklearn.neighbors import NearestNeighbors
1314

1415
from imblearn.under_sampling import EditedNearestNeighbours

imblearn/under_sampling/prototype_selection/tests/test_instance_hardness_threshold.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
from __future__ import print_function
77

88
import numpy as np
9+
from pytest import raises
10+
911
from sklearn.utils.testing import assert_array_equal
1012
from sklearn.ensemble import GradientBoostingClassifier
11-
from pytest import raises
1213

1314
from imblearn.under_sampling import InstanceHardnessThreshold
1415

15-
from pytest import raises
1616

1717
RND_SEED = 0
1818
X = np.array([[-0.3879569, 0.6894251], [-0.09322739, 1.28177189],

imblearn/under_sampling/prototype_selection/tests/test_nearmiss.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
from __future__ import print_function
77

88
import numpy as np
9+
from pytest import raises
10+
911
from sklearn.utils.testing import assert_array_equal
10-
from imblearn.utils.testing import warns
1112
from sklearn.neighbors import NearestNeighbors
12-
from pytest import raises
1313

1414
from imblearn.under_sampling import NearMiss
1515

16+
from imblearn.utils.testing import warns
17+
1618
RND_SEED = 0
1719
X = np.array([[1.17737838, -0.2002118],
1820
[0.4960075, 0.86130762],

imblearn/under_sampling/prototype_selection/tests/test_neighbourhood_cleaning_rule.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
# Christos Aridas
44
# License: MIT
55

6-
from __future__ import print_function
7-
86
import numpy as np
9-
from sklearn.utils.testing import assert_array_equal
107
from pytest import raises
118

9+
from sklearn.utils.testing import assert_array_equal
10+
1211
from sklearn.neighbors import NearestNeighbors
1312

1413
from imblearn.under_sampling import NeighbourhoodCleaningRule

imblearn/under_sampling/prototype_selection/tests/test_one_sided_selection.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
from __future__ import print_function
77

88
import numpy as np
9-
from sklearn.utils.testing import assert_array_equal
109
from pytest import raises
1110

11+
from sklearn.utils.testing import assert_array_equal
12+
1213
from sklearn.neighbors import KNeighborsClassifier
1314

1415
from imblearn.under_sampling import OneSidedSelection

imblearn/utils/estimator_checks.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
from collections import Counter
1313

1414
import numpy as np
15+
from pytest import raises
1516

1617
from sklearn.datasets import make_classification
1718
from sklearn.utils.estimator_checks import _yield_all_checks \
1819
as sklearn_yield_all_checks, check_estimator \
1920
as sklearn_check_estimator, check_parameters_default_constructible
2021
from sklearn.exceptions import NotFittedError
21-
from pytest import raises
22-
from imblearn.utils.testing import warns
2322

2423
from sklearn.utils.testing import set_random_state
2524

@@ -28,6 +27,8 @@
2827
from imblearn.under_sampling.base import BaseCleaningSampler, BaseUnderSampler
2928
from imblearn.ensemble.base import BaseEnsembleSampler
3029

30+
from imblearn.utils.testing import warns
31+
3132

3233
def _yield_sampler_checks(name, Estimator):
3334
yield check_target_type

imblearn/utils/testing.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66

77
import inspect
88
import pkgutil
9+
from contextlib import contextmanager
10+
from re import compile
911

1012
from operator import itemgetter
11-
12-
import imblearn
13-
from imblearn.base import SamplerMixin
13+
from pytest import warns as _warns
1414

1515
from sklearn.base import BaseEstimator
1616

17-
from pytest import warns as _warns
18-
from contextlib import contextmanager
19-
from re import compile
17+
from imblearn.base import SamplerMixin
18+
import imblearn
2019

2120

2221
# meta-estimators need another estimator to be instantiated.

imblearn/utils/tests/test_estimator_checks.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
"""Estimator tests - adapted from scikit-learn"""
2+
import sys
3+
24
import scipy.sparse as sp
35
import numpy as np
4-
import sys
6+
from pytest import raises
7+
58
from sklearn.externals.six.moves import cStringIO as StringIO
69

710
from sklearn.base import BaseEstimator, ClassifierMixin
811
from sklearn.utils.validation import check_X_y, check_array
912

1013
from imblearn.utils.estimator_checks import check_estimator
1114

12-
from pytest import raises
13-
1415

1516
class CorrectNotFittedError(ValueError):
1617
"""Exception class to raise if estimator is used before fitting.

imblearn/utils/tests/test_validation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
from collections import Counter
77

8+
from pytest import raises
89
import numpy as np
910

1011
from sklearn.neighbors.base import KNeighborsMixin
1112
from sklearn.neighbors import NearestNeighbors
1213

1314
from imblearn.utils.testing import warns
14-
from pytest import raises
1515

1616
from imblearn.utils import check_neighbors_object
1717
from imblearn.utils import check_ratio

0 commit comments

Comments
 (0)