From b94974992af4a003bfa54876fa4dd536b5fd7dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Mart=C3=ADn=20Bl=C3=A1zquez?= Date: Fri, 17 Jan 2025 09:30:55 +0100 Subject: [PATCH 1/3] Remove deprecated `CombineColumns` step --- src/distilabel/steps/columns/group.py | 15 +-------------- tests/unit/steps/columns/test_group.py | 17 +---------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/distilabel/steps/columns/group.py b/src/distilabel/steps/columns/group.py index ed9ee7a2df..aaea6a3fee 100644 --- a/src/distilabel/steps/columns/group.py +++ b/src/distilabel/steps/columns/group.py @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import warnings -from typing import TYPE_CHECKING, Any, List, Optional +from typing import TYPE_CHECKING, List, Optional from typing_extensions import override @@ -125,15 +124,3 @@ def process(self, *inputs: StepInput) -> "StepOutput": group_columns=self.inputs, output_group_columns=self.outputs, ) - - -class CombineColumns(GroupColumns): - """`CombineColumns` is deprecated and will be removed in version 1.5.0, use `GroupColumns` instead.""" - - def __init__(self, **data: Any) -> None: - warnings.warn( - "`CombineColumns` is deprecated and will be removed in version 1.5.0, use `GroupColumns` instead.", - DeprecationWarning, - stacklevel=2, - ) - return super().__init__(**data) diff --git a/tests/unit/steps/columns/test_group.py b/tests/unit/steps/columns/test_group.py index 57f9f114de..c929cda927 100644 --- a/tests/unit/steps/columns/test_group.py +++ b/tests/unit/steps/columns/test_group.py @@ -13,11 +13,9 @@ # limitations under the License. -import pytest - from distilabel.constants import DISTILABEL_METADATA_KEY from distilabel.pipeline.local import Pipeline -from distilabel.steps.columns.group import CombineColumns, GroupColumns +from distilabel.steps.columns.group import GroupColumns class TestGroupColumns: @@ -58,16 +56,3 @@ def test_process(self) -> None: DISTILABEL_METADATA_KEY: {"model": ["model-1", "model-2"]}, } ] - - -def test_CombineColumns_deprecation_warning(): - with pytest.deprecated_call(): - CombineColumns( - name="combine_columns", - columns=["generation", "model_name"], - ) - from packaging.version import Version - - import distilabel - - assert Version(distilabel.__version__) <= Version("1.5.0") From 0dd926163531f372ace3c077d0b1d30131c93c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Mart=C3=ADn=20Bl=C3=A1zquez?= Date: Fri, 17 Jan 2025 10:11:20 +0100 Subject: [PATCH 2/3] Remove `CombineColumns` import --- src/distilabel/steps/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/distilabel/steps/__init__.py b/src/distilabel/steps/__init__.py index 19d90f9a33..661704c7d8 100644 --- a/src/distilabel/steps/__init__.py +++ b/src/distilabel/steps/__init__.py @@ -26,7 +26,7 @@ from distilabel.steps.clustering.umap import UMAP from distilabel.steps.columns.combine import CombineOutputs from distilabel.steps.columns.expand import ExpandColumns -from distilabel.steps.columns.group import CombineColumns, GroupColumns +from distilabel.steps.columns.group import GroupColumns from distilabel.steps.columns.keep import KeepColumns from distilabel.steps.columns.merge import MergeColumns from distilabel.steps.decorator import step @@ -60,7 +60,6 @@ __all__ = [ "DBSCAN", "UMAP", - "CombineColumns", "CombineOutputs", "ConversationTemplate", "DataSampler", From b0b11bf95bf4ccd35b049042d286477b50aaa69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Mart=C3=ADn=20Bl=C3=A1zquez?= Date: Fri, 17 Jan 2025 10:50:48 +0100 Subject: [PATCH 3/3] Remove `CombineColumns` from test --- tests/unit/test_imports.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/test_imports.py b/tests/unit/test_imports.py index a836cceb15..1309232a27 100644 --- a/tests/unit/test_imports.py +++ b/tests/unit/test_imports.py @@ -40,7 +40,6 @@ def test_imports() -> None: from distilabel.steps import ( StepResources, - CombineColumns, GroupColumns, MergeColumns, ConversationTemplate,