MAINT remove possibility to pass arguments by position (#952)

glemaitre · web-flow · commit a9470dc4228a · 2022-12-03T21:42:18.000+01:00
diff --git a/imblearn/base.py b/imblearn/base.py
@@ -12,7 +12,7 @@
 from sklearn.utils.multiclass import check_classification_targets
 
 from .utils import check_sampling_strategy, check_target_type
-from .utils._validation import ArraysTransformer, _deprecate_positional_args
+from .utils._validation import ArraysTransformer
 
 
 class SamplerMixin(BaseEstimator, metaclass=ABCMeta):
@@ -241,7 +241,6 @@ class FunctionSampler(BaseSampler):
 
     _sampling_type = "bypass"
 
-    @_deprecate_positional_args
     def __init__(self, *, func=None, accept_sparse=True, kw_args=None, validate=True):
         super().__init__()
         self.func = func
diff --git a/imblearn/combine/_smote_enn.py b/imblearn/combine/_smote_enn.py
@@ -13,7 +13,6 @@
 from ..under_sampling import EditedNearestNeighbours
 from ..utils import Substitution, check_target_type
 from ..utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ..utils._validation import _deprecate_positional_args
 
 
 @Substitution(
@@ -103,7 +102,6 @@ class SMOTEENN(BaseSampler):
 
     _sampling_type = "over-sampling"
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
diff --git a/imblearn/combine/_smote_tomek.py b/imblearn/combine/_smote_tomek.py
@@ -14,7 +14,6 @@
 from ..under_sampling import TomekLinks
 from ..utils import Substitution, check_target_type
 from ..utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ..utils._validation import _deprecate_positional_args
 
 
 @Substitution(
@@ -101,7 +100,6 @@ class SMOTETomek(BaseSampler):
 
     _sampling_type = "over-sampling"
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
diff --git a/imblearn/datasets/_imbalance.py b/imblearn/datasets/_imbalance.py
@@ -9,10 +9,8 @@
 
 from ..under_sampling import RandomUnderSampler
 from ..utils import check_sampling_strategy
-from ..utils._validation import _deprecate_positional_args
 
 
-@_deprecate_positional_args
 def make_imbalance(
     X, y, *, sampling_strategy=None, random_state=None, verbose=False, **kwargs
 ):
diff --git a/imblearn/datasets/_zenodo.py b/imblearn/datasets/_zenodo.py
@@ -54,8 +54,6 @@
 from sklearn.datasets import get_data_home
 from sklearn.utils import Bunch, check_random_state
 
-from ..utils._validation import _deprecate_positional_args
-
 URL = "https://zenodo.org/record/61452/files/benchmark-imbalanced-learn.tar.gz"
 PRE_FILENAME = "x"
 POST_FILENAME = "data.npz"
@@ -97,7 +95,6 @@
     MAP_ID_NAME[v + 1] = k
 
 
-@_deprecate_positional_args
 def fetch_datasets(
     *,
     data_home=None,
diff --git a/imblearn/ensemble/_bagging.py b/imblearn/ensemble/_bagging.py
@@ -24,7 +24,6 @@
 from ..utils import Substitution, check_sampling_strategy, check_target_type
 from ..utils._available_if import available_if
 from ..utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ..utils._validation import _deprecate_positional_args
 from ._common import _estimator_has
 
 
@@ -253,7 +252,6 @@ class BalancedBaggingClassifier(BaggingClassifier):
      [  2 225]]
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         estimator=None,
diff --git a/imblearn/ensemble/_easy_ensemble.py b/imblearn/ensemble/_easy_ensemble.py
@@ -23,7 +23,6 @@
 from ..utils import Substitution, check_sampling_strategy, check_target_type
 from ..utils._available_if import available_if
 from ..utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ..utils._validation import _deprecate_positional_args
 from ._common import _estimator_has
 
 MAX_INT = np.iinfo(np.int32).max
@@ -178,7 +177,6 @@ class EasyEnsembleClassifier(BaggingClassifier):
      [  2 225]]
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         n_estimators=10,
diff --git a/imblearn/ensemble/_forest.py b/imblearn/ensemble/_forest.py
@@ -33,7 +33,7 @@
 from ..under_sampling.base import BaseUnderSampler
 from ..utils import Substitution
 from ..utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ..utils._validation import _deprecate_positional_args, check_sampling_strategy
+from ..utils._validation import check_sampling_strategy
 
 MAX_INT = np.iinfo(np.int32).max
 sklearn_version = parse_version(sklearn.__version__)
@@ -352,7 +352,6 @@ class labels (multi-output problem).
     [1]
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         n_estimators=100,
diff --git a/imblearn/ensemble/_weight_boosting.py b/imblearn/ensemble/_weight_boosting.py
@@ -16,7 +16,6 @@
 from ..under_sampling.base import BaseUnderSampler
 from ..utils import Substitution, check_target_type
 from ..utils._docstring import _random_state_docstring
-from ..utils._validation import _deprecate_positional_args
 
 
 @Substitution(
@@ -164,7 +163,6 @@ class RUSBoostClassifier(AdaBoostClassifier):
     array([...])
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         estimator=None,
diff --git a/imblearn/ensemble/tests/test_bagging.py b/imblearn/ensemble/tests/test_bagging.py
@@ -72,7 +72,6 @@ def test_balanced_bagging_classifier(estimator, params):
     )
     bag.predict(X_test)
     bag.predict_proba(X_test)
-    bag.predict_log_proba(X_test)
     bag.score(X_test, y_test)
     if hasattr(estimator, "decision_function"):
         bag.decision_function(X_test)
diff --git a/imblearn/keras/_generator.py b/imblearn/keras/_generator.py
@@ -59,7 +59,6 @@ def import_from_tensforflow():
 from ..under_sampling import RandomUnderSampler  # noqa
 from ..utils import Substitution  # noqa
 from ..utils._docstring import _random_state_docstring  # noqa
-from ..utils._validation import _deprecate_positional_args  # noqa
 
 
 class BalancedBatchGenerator(*ParentClass):  # type: ignore
@@ -142,7 +141,6 @@ class BalancedBatchGenerator(*ParentClass):  # type: ignore
     # flag for keras sequence duck-typing
     use_sequence_api = True
 
-    @_deprecate_positional_args
     def __init__(
         self,
         X,
@@ -205,7 +203,6 @@ def __getitem__(self, index):
 
 
 @Substitution(random_state=_random_state_docstring)
-@_deprecate_positional_args
 def balanced_batch_generator(
     X,
     y,
diff --git a/imblearn/metrics/_classification.py b/imblearn/metrics/_classification.py
@@ -26,10 +26,7 @@
 from sklearn.utils.multiclass import unique_labels
 from sklearn.utils.validation import check_consistent_length, column_or_1d
 
-from ..utils._validation import _deprecate_positional_args
 
-
-@_deprecate_positional_args
 def sensitivity_specificity_support(
     y_true,
     y_pred,
@@ -277,7 +274,6 @@ def sensitivity_specificity_support(
     return sensitivity, specificity, true_sum
 
 
-@_deprecate_positional_args
 def sensitivity_score(
     y_true,
     y_pred,
@@ -378,7 +374,6 @@ def sensitivity_score(
     return s
 
 
-@_deprecate_positional_args
 def specificity_score(
     y_true,
     y_pred,
@@ -479,7 +474,6 @@ def specificity_score(
     return s
 
 
-@_deprecate_positional_args
 def geometric_mean_score(
     y_true,
     y_pred,
@@ -664,7 +658,6 @@ class is unrecognized by the classifier, G-mean resolves to zero. To
         return gmean
 
 
-@_deprecate_positional_args
 def make_index_balanced_accuracy(*, alpha=0.1, squared=True):
     """Balance any scoring function using the index balanced accuracy.
 
@@ -770,7 +763,6 @@ def compute_score(*args, **kwargs):
     return decorate
 
 
-@_deprecate_positional_args
 def classification_report_imbalanced(
     y_true,
     y_pred,
diff --git a/imblearn/over_sampling/_adasyn.py b/imblearn/over_sampling/_adasyn.py
@@ -12,7 +12,6 @@
 
 from ..utils import Substitution, check_neighbors_object
 from ..utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ..utils._validation import _deprecate_positional_args
 from .base import BaseOverSampler
 
 
@@ -115,7 +114,6 @@ class ADASYN(BaseOverSampler):
     Resampled dataset shape Counter({{0: 904, 1: 900}})
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
diff --git a/imblearn/over_sampling/_random_over_sampler.py b/imblearn/over_sampling/_random_over_sampler.py
@@ -14,7 +14,6 @@
 
 from ..utils import Substitution, check_target_type
 from ..utils._docstring import _random_state_docstring
-from ..utils._validation import _deprecate_positional_args
 from .base import BaseOverSampler
 
 
@@ -130,7 +129,6 @@ class RandomOverSampler(BaseOverSampler):
     Resampled dataset shape Counter({{0: 900, 1: 900}})
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
diff --git a/imblearn/over_sampling/_smote/base.py b/imblearn/over_sampling/_smote/base.py
@@ -22,7 +22,6 @@
 from ...metrics.pairwise import ValueDifferenceMetric
 from ...utils import Substitution, check_neighbors_object, check_target_type
 from ...utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ...utils._validation import _deprecate_positional_args
 from ...utils.fixes import _mode
 from ..base import BaseOverSampler
 
@@ -301,7 +300,6 @@ class SMOTE(BaseSMOTE):
     Resampled dataset shape Counter({{0: 900, 1: 900}})
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
@@ -491,7 +489,6 @@ class SMOTENC(SMOTE):
 
     _required_parameters = ["categorical_features"]
 
-    @_deprecate_positional_args
     def __init__(
         self,
         categorical_features,
diff --git a/imblearn/over_sampling/_smote/cluster.py b/imblearn/over_sampling/_smote/cluster.py
@@ -16,7 +16,6 @@
 
 from ...utils import Substitution
 from ...utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ...utils._validation import _deprecate_positional_args
 from ..base import BaseOverSampler
 from .base import BaseSMOTE
 
@@ -139,7 +138,6 @@ class KMeansSMOTE(BaseSMOTE):
     More 0 samples: True
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
diff --git a/imblearn/over_sampling/_smote/filter.py b/imblearn/over_sampling/_smote/filter.py
@@ -16,7 +16,6 @@
 
 from ...utils import Substitution, check_neighbors_object
 from ...utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ...utils._validation import _deprecate_positional_args
 from ..base import BaseOverSampler
 from .base import BaseSMOTE
 
@@ -145,7 +144,6 @@ class BorderlineSMOTE(BaseSMOTE):
     Resampled dataset shape Counter({{0: 900, 1: 900}})
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
@@ -398,7 +396,6 @@ class SVMSMOTE(BaseSMOTE):
     Resampled dataset shape Counter({{0: 900, 1: 900}})
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
diff --git a/imblearn/tensorflow/_generator.py b/imblearn/tensorflow/_generator.py
@@ -7,11 +7,9 @@
 from ..under_sampling import RandomUnderSampler
 from ..utils import Substitution
 from ..utils._docstring import _random_state_docstring
-from ..utils._validation import _deprecate_positional_args
 
 
 @Substitution(random_state=_random_state_docstring)
-@_deprecate_positional_args
 def balanced_batch_generator(
     X,
     y,
diff --git a/imblearn/under_sampling/_prototype_generation/_cluster_centroids.py b/imblearn/under_sampling/_prototype_generation/_cluster_centroids.py
@@ -15,7 +15,6 @@
 
 from ...utils import Substitution
 from ...utils._docstring import _random_state_docstring
-from ...utils._validation import _deprecate_positional_args
 from ..base import BaseUnderSampler
 
 VOTING_KIND = ("auto", "hard", "soft")
@@ -108,7 +107,6 @@ class ClusterCentroids(BaseUnderSampler):
     Resampled dataset shape Counter({{...}})
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
diff --git a/imblearn/under_sampling/_prototype_selection/_condensed_nearest_neighbour.py b/imblearn/under_sampling/_prototype_selection/_condensed_nearest_neighbour.py
@@ -15,7 +15,6 @@
 
 from ...utils import Substitution
 from ...utils._docstring import _n_jobs_docstring, _random_state_docstring
-from ...utils._validation import _deprecate_positional_args
 from ..base import BaseCleaningSampler
 
 
@@ -105,7 +104,6 @@ class CondensedNearestNeighbour(BaseCleaningSampler):
     Resampled dataset shape Counter({{-1: 268, 1: 227}})  # doctest: +SKIP
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
diff --git a/imblearn/under_sampling/_prototype_selection/_edited_nearest_neighbours.py b/imblearn/under_sampling/_prototype_selection/_edited_nearest_neighbours.py
@@ -13,7 +13,6 @@
 
 from ...utils import Substitution, check_neighbors_object
 from ...utils._docstring import _n_jobs_docstring
-from ...utils._validation import _deprecate_positional_args
 from ...utils.fixes import _mode
 from ..base import BaseCleaningSampler
 
@@ -113,7 +112,6 @@ class EditedNearestNeighbours(BaseCleaningSampler):
     Resampled dataset shape Counter({{1: 887, 0: 100}})
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
@@ -281,7 +279,6 @@ class RepeatedEditedNearestNeighbours(BaseCleaningSampler):
     Resampled dataset shape Counter({{1: 887, 0: 100}})
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
@@ -480,7 +477,6 @@ class without early stopping.
     Resampled dataset shape Counter({{1: 887, 0: 100}})
     """
 
-    @_deprecate_positional_args
     def __init__(
         self,
         *,
diff --git a/imblearn/under_sampling/_prototype_selection/_instance_hardness_threshold.py b/imblearn/under_sampling/_prototype_selection/_instance_hardness_threshold.py
diff --git a/imblearn/under_sampling/_prototype_selection/_nearmiss.py b/imblearn/under_sampling/_prototype_selection/_nearmiss.py
diff --git a/imblearn/under_sampling/_prototype_selection/_neighbourhood_cleaning_rule.py b/imblearn/under_sampling/_prototype_selection/_neighbourhood_cleaning_rule.py
diff --git a/imblearn/under_sampling/_prototype_selection/_one_sided_selection.py b/imblearn/under_sampling/_prototype_selection/_one_sided_selection.py
diff --git a/imblearn/under_sampling/_prototype_selection/_random_under_sampler.py b/imblearn/under_sampling/_prototype_selection/_random_under_sampler.py
diff --git a/imblearn/under_sampling/_prototype_selection/_tomek_links.py b/imblearn/under_sampling/_prototype_selection/_tomek_links.py

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,6 @@ def test_balanced_bagging_classifier(estimator, params):`
`72`	`72`	`)`
`73`	`73`	`bag.predict(X_test)`
`74`	`74`	`bag.predict_proba(X_test)`
`75`		`- bag.predict_log_proba(X_test)`
`76`	`75`	`bag.score(X_test, y_test)`
`77`	`76`	`if hasattr(estimator, "decision_function"):`
`78`	`77`	`bag.decision_function(X_test)`