remove legacy adapt calls in test

aeon-toolkit · Jul 13, 2024 · 36bb980 · 36bb980
1 parent a19b90b
commit 36bb980
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 22 deletions.
diff --git a/aeon/classification/compose/tests/test_pipeline.py b/aeon/classification/compose/tests/test_pipeline.py
@@ -17,7 +17,6 @@
 )
 from aeon.testing.mock_estimators import MockCollectionTransformer
 from aeon.testing.utils.estimator_checks import _assert_array_almost_equal
-from aeon.transformations._legacy.adapt import TabularToSeriesAdaptor
 from aeon.transformations.collection import (
     AutocorrelationFunctionTransformer,
     HOG1DTransformer,
@@ -33,12 +32,10 @@
     [
         PaddingTransformer(pad_length=15),
         SevenNumberSummaryTransformer(),
-        TabularToSeriesAdaptor(StandardScaler()),
         [PaddingTransformer(pad_length=15), Tabularizer(), StandardScaler()],
         [PaddingTransformer(pad_length=15), SevenNumberSummaryTransformer()],
         [Tabularizer(), StandardScaler(), SevenNumberSummaryTransformer()],
         [
-            TabularToSeriesAdaptor(StandardScaler()),
             PaddingTransformer(pad_length=15),
             SevenNumberSummaryTransformer(),
         ],
@@ -78,7 +75,6 @@ def test_classifier_pipeline(transformers):
         [PaddingTransformer(pad_length=15), SevenNumberSummaryTransformer()],
         [Tabularizer(), StandardScaler(), SevenNumberSummaryTransformer()],
         [
-            TabularToSeriesAdaptor(StandardScaler()),
             PaddingTransformer(pad_length=15),
             SevenNumberSummaryTransformer(),
         ],

diff --git a/aeon/clustering/compose/tests/test_pipeline.py b/aeon/clustering/compose/tests/test_pipeline.py
@@ -15,7 +15,6 @@
 )
 from aeon.testing.mock_estimators import MockCollectionTransformer
 from aeon.testing.utils.estimator_checks import _assert_array_almost_equal
-from aeon.transformations._legacy.adapt import TabularToSeriesAdaptor
 from aeon.transformations.collection import (
     AutocorrelationFunctionTransformer,
     HOG1DTransformer,
@@ -31,12 +30,10 @@
     [
         PaddingTransformer(pad_length=15),
         SevenNumberSummaryTransformer(),
-        TabularToSeriesAdaptor(StandardScaler()),
         [PaddingTransformer(pad_length=15), Tabularizer(), StandardScaler()],
         [PaddingTransformer(pad_length=15), SevenNumberSummaryTransformer()],
         [Tabularizer(), StandardScaler(), SevenNumberSummaryTransformer()],
         [
-            TabularToSeriesAdaptor(StandardScaler()),
             PaddingTransformer(pad_length=15),
             SevenNumberSummaryTransformer(),
         ],
@@ -76,7 +73,6 @@ def test_clusterer_pipeline(transformers):
         [PaddingTransformer(pad_length=15), SevenNumberSummaryTransformer()],
         [Tabularizer(), StandardScaler(), SevenNumberSummaryTransformer()],
         [
-            TabularToSeriesAdaptor(StandardScaler()),
             PaddingTransformer(pad_length=15),
             SevenNumberSummaryTransformer(),
         ],

diff --git a/aeon/regression/compose/tests/test_pipeline.py b/aeon/regression/compose/tests/test_pipeline.py
@@ -17,7 +17,6 @@
 )
 from aeon.testing.mock_estimators import MockCollectionTransformer
 from aeon.testing.utils.estimator_checks import _assert_array_almost_equal
-from aeon.transformations._legacy.adapt import TabularToSeriesAdaptor
 from aeon.transformations.collection import (
     AutocorrelationFunctionTransformer,
     HOG1DTransformer,
@@ -33,12 +32,10 @@
     [
         PaddingTransformer(pad_length=15),
         SevenNumberSummaryTransformer(),
-        TabularToSeriesAdaptor(StandardScaler()),
         [PaddingTransformer(pad_length=15), Tabularizer(), StandardScaler()],
         [PaddingTransformer(pad_length=15), SevenNumberSummaryTransformer()],
         [Tabularizer(), StandardScaler(), SevenNumberSummaryTransformer()],
         [
-            TabularToSeriesAdaptor(StandardScaler()),
             PaddingTransformer(pad_length=15),
             SevenNumberSummaryTransformer(),
         ],
@@ -78,7 +75,6 @@ def test_regressor_pipeline(transformers):
         [PaddingTransformer(pad_length=15), SevenNumberSummaryTransformer()],
         [Tabularizer(), StandardScaler(), SevenNumberSummaryTransformer()],
         [
-            TabularToSeriesAdaptor(StandardScaler()),
             PaddingTransformer(pad_length=15),
             SevenNumberSummaryTransformer(),
         ],

diff --git a/aeon/transformations/_legacy/adapt.py b/aeon/transformations/_legacy/adapt.py
@@ -4,18 +4,11 @@
 __all__ = ["TabularToSeriesAdaptor"]
 
 import numpy as np
-from deprecated.sphinx import deprecated
 from sklearn.base import clone
 
 from aeon.transformations.base import BaseTransformer
 
 
-# TODO: remove in v0.11.0
-@deprecated(
-    version="0.10.0",
-    reason="TabularToSeriesAdaptor will be removed in version 0.11.0.",
-    category=FutureWarning,
-)
 class TabularToSeriesAdaptor(BaseTransformer):
     """
     Adapt scikit-learn transformation interface to time series setting.

diff --git a/aeon/transformations/collection/compose/tests/test_pipeline.py b/aeon/transformations/collection/compose/tests/test_pipeline.py
@@ -11,7 +11,6 @@
 )
 from aeon.testing.mock_estimators import MockCollectionTransformer
 from aeon.testing.utils.estimator_checks import _assert_array_almost_equal
-from aeon.transformations._legacy.adapt import TabularToSeriesAdaptor
 from aeon.transformations.collection import (
     AutocorrelationFunctionTransformer,
     HOG1DTransformer,
@@ -28,12 +27,10 @@
     [
         PaddingTransformer(pad_length=15),
         SevenNumberSummaryTransformer(),
-        [TabularToSeriesAdaptor(StandardScaler())],
         [PaddingTransformer(pad_length=15), Tabularizer(), StandardScaler()],
         [PaddingTransformer(pad_length=15), SevenNumberSummaryTransformer()],
         [Tabularizer(), StandardScaler(), SevenNumberSummaryTransformer()],
         [
-            TabularToSeriesAdaptor(StandardScaler()),
             PaddingTransformer(pad_length=15),
             SevenNumberSummaryTransformer(),
         ],