Revert "Merge branch 'tswast-circular-import' into b366248570-dropna-subset"

This reverts commit 57e8335, reversing
changes made to 197074a.

Author: tswast

bigframes/core/block_transforms.py

@@ -15,7 +15,7 @@
 
 import functools
 import typing
-from typing import Optional, Sequence
+from typing import Sequence
 
 import bigframes_vendored.constants as constants
 import pandas as pd
@@ -489,19 +489,11 @@ def dropna(
     block: blocks.Block,
     column_ids: typing.Sequence[str],
     how: typing.Literal["all", "any"] = "any",
-    subset: Optional[typing.Sequence[str]] = None,
 ):
     """
     Drop na entries from block
     """
-    if subset is None:
-        subset = column_ids
-
-    predicates = [
-        ops.notnull_op.as_expr(column_id)
-        for column_id in column_ids
-        if column_id in subset
-    ]
+    predicates = [ops.notnull_op.as_expr(column_id) for column_id in column_ids]
     if len(predicates) == 0:
         return block
     if how == "any":

bigframes/dataframe.py

@@ -2020,9 +2020,8 @@ def dropna(
         self,
         *,
         axis: int | str = 0,
-        how: str = "any",
-        subset: typing.Union[None, blocks.Label, Sequence[blocks.Label]] = None,
         inplace: bool = False,
+        how: str = "any",
         ignore_index=False,
     ) -> DataFrame:
         if inplace:
@@ -2034,23 +2033,8 @@ def dropna(
 
         axis_n = utils.get_axis_number(axis)
 
-        if subset is not None and axis_n != 0:
-            raise NotImplementedError(
-                f"subset only supported when axis=0. {constants.FEEDBACK_LINK}"
-            )
-
         if axis_n == 0:
-            # subset needs to be converted into column IDs, not column labels.
-            if subset is None:
-                subset_ids = None
-            elif not utils.is_list_like(subset):
-                subset_ids = [self._block.label_to_col_id[subset]]
-            else:
-                subset_ids = [
-                    id for label in subset for id in self._block.label_to_col_id[label]
-                ]
-
-            result = block_ops.dropna(self._block, self._block.value_columns, how=how, subset=subset_ids)  # type: ignore
+            result = block_ops.dropna(self._block, self._block.value_columns, how=how)  # type: ignore
             if ignore_index:
                 result = result.reset_index()
             return DataFrame(result)

tests/system/small/test_dataframe.py

@@ -936,24 +936,19 @@ def test_assign_callable_lambda(scalars_dfs):
 
 @skip_legacy_pandas
 @pytest.mark.parametrize(
-    ("axis", "how", "ignore_index", "subset"),
+    ("axis", "how", "ignore_index"),
     [
-        (0, "any", False, None),
-        (0, "any", True, None),
-        (0, "all", False, ["bool_col", "time_col"]),
-        (0, "any", False, ["bool_col", "time_col"]),
-        (0, "all", False, "time_col"),
-        (1, "any", False, None),
-        (1, "all", False, None),
+        (0, "any", False),
+        (0, "any", True),
+        (1, "any", False),
+        (1, "all", False),
     ],
 )
-def test_df_dropna(scalars_dfs, axis, how, ignore_index, subset):
+def test_df_dropna(scalars_dfs, axis, how, ignore_index):
     scalars_df, scalars_pandas_df = scalars_dfs
-    df = scalars_df.dropna(axis=axis, how=how, ignore_index=ignore_index, subset=subset)
+    df = scalars_df.dropna(axis=axis, how=how, ignore_index=ignore_index)
     bf_result = df.to_pandas()
-    pd_result = scalars_pandas_df.dropna(
-        axis=axis, how=how, ignore_index=ignore_index, subset=subset
-    )
+    pd_result = scalars_pandas_df.dropna(axis=axis, how=how, ignore_index=ignore_index)
 
     # Pandas uses int64 instead of Int64 (nullable) dtype.
     pd_result.index = pd_result.index.astype(pd.Int64Dtype())

tests/unit/test_dataframe.py

@@ -20,15 +20,6 @@
 from . import resources
 
 
-def test_dataframe_dropna_axis_1_subset_not_implememented(
-    monkeypatch: pytest.MonkeyPatch,
-):
-    dataframe = resources.create_dataframe(monkeypatch)
-
-    with pytest.raises(NotImplementedError, match="subset"):
-        dataframe.dropna(axis=1, subset=["col1", "col2"])
-
-
 def test_dataframe_repr_with_uninitialized_object():
     """Ensures DataFrame.__init__ can be paused in a visual debugger without crashing.
 

third_party/bigframes_vendored/pandas/core/frame.py

@@ -1614,8 +1614,6 @@ def dropna(
         *,
         axis: int | str = 0,
         how: str = "any",
-        subset=None,
-        inplace: bool = False,
         ignore_index=False,
     ) -> DataFrame:
         """Remove missing values.
@@ -1686,12 +1684,6 @@ def dropna(
 
                 * 'any' : If any NA values are present, drop that row or column.
                 * 'all' : If all values are NA, drop that row or column.
-            subset (column label or sequence of labels, optional):
-                Labels along other axis to consider, e.g. if you are dropping
-                rows these would be a list of columns to include.
-                Only supports axis=0.
-            inplace (bool, default ``False``):
-                Not supported.
             ignore_index (bool, default ``False``):
                 If ``True``, the resulting axis will be labeled 0, 1, …, n - 1.