Skip to content

Commit d04f069

Browse files
authored
Remove deprecated CombineColumns step (#1101)
1 parent 2c85dcc commit d04f069

File tree

4 files changed

+3
-33
lines changed

4 files changed

+3
-33
lines changed

Diff for: src/distilabel/steps/__init__.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from distilabel.steps.clustering.umap import UMAP
2727
from distilabel.steps.columns.combine import CombineOutputs
2828
from distilabel.steps.columns.expand import ExpandColumns
29-
from distilabel.steps.columns.group import CombineColumns, GroupColumns
29+
from distilabel.steps.columns.group import GroupColumns
3030
from distilabel.steps.columns.keep import KeepColumns
3131
from distilabel.steps.columns.merge import MergeColumns
3232
from distilabel.steps.decorator import step
@@ -60,7 +60,6 @@
6060
__all__ = [
6161
"DBSCAN",
6262
"UMAP",
63-
"CombineColumns",
6463
"CombineOutputs",
6564
"ConversationTemplate",
6665
"DataSampler",

Diff for: src/distilabel/steps/columns/group.py

+1-14
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import warnings
16-
from typing import TYPE_CHECKING, Any, List, Optional
15+
from typing import TYPE_CHECKING, List, Optional
1716

1817
from typing_extensions import override
1918

@@ -125,15 +124,3 @@ def process(self, *inputs: StepInput) -> "StepOutput":
125124
group_columns=self.inputs,
126125
output_group_columns=self.outputs,
127126
)
128-
129-
130-
class CombineColumns(GroupColumns):
131-
"""`CombineColumns` is deprecated and will be removed in version 1.5.0, use `GroupColumns` instead."""
132-
133-
def __init__(self, **data: Any) -> None:
134-
warnings.warn(
135-
"`CombineColumns` is deprecated and will be removed in version 1.5.0, use `GroupColumns` instead.",
136-
DeprecationWarning,
137-
stacklevel=2,
138-
)
139-
return super().__init__(**data)

Diff for: tests/unit/steps/columns/test_group.py

+1-16
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@
1313
# limitations under the License.
1414

1515

16-
import pytest
17-
1816
from distilabel.constants import DISTILABEL_METADATA_KEY
1917
from distilabel.pipeline.local import Pipeline
20-
from distilabel.steps.columns.group import CombineColumns, GroupColumns
18+
from distilabel.steps.columns.group import GroupColumns
2119

2220

2321
class TestGroupColumns:
@@ -58,16 +56,3 @@ def test_process(self) -> None:
5856
DISTILABEL_METADATA_KEY: {"model": ["model-1", "model-2"]},
5957
}
6058
]
61-
62-
63-
def test_CombineColumns_deprecation_warning():
64-
with pytest.deprecated_call():
65-
CombineColumns(
66-
name="combine_columns",
67-
columns=["generation", "model_name"],
68-
)
69-
from packaging.version import Version
70-
71-
import distilabel
72-
73-
assert Version(distilabel.__version__) <= Version("1.5.0")

Diff for: tests/unit/test_imports.py

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ def test_imports() -> None:
4040

4141
from distilabel.steps import (
4242
StepResources,
43-
CombineColumns,
4443
GroupColumns,
4544
MergeColumns,
4645
ConversationTemplate,

0 commit comments

Comments
 (0)