From 065f478face303c0e8aedf52f565dd580b79f0be Mon Sep 17 00:00:00 2001 From: Nilesh Patra Date: Tue, 27 Feb 2024 15:36:05 +0100 Subject: [PATCH 1/4] Distutils is deprecated, drop it This patch was needed in Debian Co-authored-by: Michael R. Crusoe --- imblearn/_min_dependencies.py | 1 + imblearn/tensorflow/tests/test_generator.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/imblearn/_min_dependencies.py b/imblearn/_min_dependencies.py index 497688765..e9ecde618 100644 --- a/imblearn/_min_dependencies.py +++ b/imblearn/_min_dependencies.py @@ -37,6 +37,7 @@ "numpydoc": ("1.5.0", "docs"), "sphinxcontrib-bibtex": ("2.4.1", "docs"), "pydata-sphinx-theme": ("0.13.3", "docs"), + "packaging":("14.1", "tests"), } diff --git a/imblearn/tensorflow/tests/test_generator.py b/imblearn/tensorflow/tests/test_generator.py index bcc10b8f1..bab1449e7 100644 --- a/imblearn/tensorflow/tests/test_generator.py +++ b/imblearn/tensorflow/tests/test_generator.py @@ -1,4 +1,4 @@ -from distutils.version import LooseVersion +from packaging.version import parse import numpy as np import pytest @@ -147,7 +147,7 @@ def accuracy(y_true, y_pred): @pytest.mark.parametrize("sampler", [None, NearMiss(), RandomOverSampler()]) def test_balanced_batch_generator(data, sampler): - if LooseVersion(tf.__version__) < "2": + if parse(tf.__version__) < "2": check_balanced_batch_generator_tf_1_X_X(data, sampler) else: check_balanced_batch_generator_tf_2_X_X_compat_1_X_X(data, sampler) From 58445d9d990ca276a0cdc126004cd2e48785c669 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sat, 30 Mar 2024 18:55:37 +0100 Subject: [PATCH 2/4] use sklearn to parse version --- imblearn/_min_dependencies.py | 1 - imblearn/tensorflow/tests/test_generator.py | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/imblearn/_min_dependencies.py b/imblearn/_min_dependencies.py index e9ecde618..497688765 100644 --- a/imblearn/_min_dependencies.py +++ b/imblearn/_min_dependencies.py @@ -37,7 +37,6 @@ "numpydoc": ("1.5.0", "docs"), "sphinxcontrib-bibtex": ("2.4.1", "docs"), "pydata-sphinx-theme": ("0.13.3", "docs"), - "packaging":("14.1", "tests"), } diff --git a/imblearn/tensorflow/tests/test_generator.py b/imblearn/tensorflow/tests/test_generator.py index bab1449e7..3b9aa0575 100644 --- a/imblearn/tensorflow/tests/test_generator.py +++ b/imblearn/tensorflow/tests/test_generator.py @@ -1,9 +1,8 @@ -from packaging.version import parse - import numpy as np import pytest from scipy import sparse from sklearn.datasets import load_iris +from sklearn.utils.fixes import parse_version from imblearn.datasets import make_imbalance from imblearn.over_sampling import RandomOverSampler @@ -147,7 +146,7 @@ def accuracy(y_true, y_pred): @pytest.mark.parametrize("sampler", [None, NearMiss(), RandomOverSampler()]) def test_balanced_batch_generator(data, sampler): - if parse(tf.__version__) < "2": + if parse_version(tf.__version__) < "2": check_balanced_batch_generator_tf_1_X_X(data, sampler) else: check_balanced_batch_generator_tf_2_X_X_compat_1_X_X(data, sampler) From d784ccf05e2a75e22361c09c0478ba63f47e42fa Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sat, 30 Mar 2024 19:23:36 +0100 Subject: [PATCH 3/4] iter --- imblearn/tensorflow/tests/test_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imblearn/tensorflow/tests/test_generator.py b/imblearn/tensorflow/tests/test_generator.py index 3b9aa0575..e0c7a9103 100644 --- a/imblearn/tensorflow/tests/test_generator.py +++ b/imblearn/tensorflow/tests/test_generator.py @@ -146,7 +146,7 @@ def accuracy(y_true, y_pred): @pytest.mark.parametrize("sampler", [None, NearMiss(), RandomOverSampler()]) def test_balanced_batch_generator(data, sampler): - if parse_version(tf.__version__) < "2": + if parse_version(tf.__version__) < parse_version("2.0.0"): check_balanced_batch_generator_tf_1_X_X(data, sampler) else: check_balanced_batch_generator_tf_2_X_X_compat_1_X_X(data, sampler) From 8cb75547d8b704cefcb6002a4389779894e498ea Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sun, 31 Mar 2024 12:50:40 +0200 Subject: [PATCH 4/4] update changelog --- doc/whats_new/v0.12.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/whats_new/v0.12.rst b/doc/whats_new/v0.12.rst index 6585c3b58..bc707ae8c 100644 --- a/doc/whats_new/v0.12.rst +++ b/doc/whats_new/v0.12.rst @@ -15,6 +15,12 @@ Bug fixes `estimator` could not be a :class:`~sklearn.pipeline.Pipeline` object. :pr:`1049` by :user:`Gonenc Mogol `. +Compatibility +............. + +- Do not use `distutils` in tests due to deprecation. + :pr:`1065` by :user:`Michael R. Crusoe ` + Version 0.12.0 ==============