Merge remote-tracking branch 'upstream/main' into compliant-package

Author: dangotbanned

narwhals/_arrow/series.py

@@ -280,11 +280,13 @@ def _type(self: Self) -> pa.DataType:
     def len(self: Self, *, _return_py_scalar: bool = True) -> int:
         return maybe_extract_py_scalar(len(self._native_series), _return_py_scalar)
 
-    def filter(self: Self, other: ArrowSeries | list[bool | None]) -> Self:
-        if not (isinstance(other, list) and all(isinstance(x, bool) for x in other)):
-            _, other_native = extract_native(self, other)
+    def filter(self: Self, predicate: ArrowSeries | list[bool | None]) -> Self:
+        if not (
+            isinstance(predicate, list) and all(isinstance(x, bool) for x in predicate)
+        ):
+            _, other_native = extract_native(self, predicate)
         else:
-            other_native = other
+            other_native = predicate
         return self._from_native_series(self._native_series.filter(other_native))  # pyright: ignore[reportArgumentType]
 
     def mean(self: Self, *, _return_py_scalar: bool = True) -> float:

narwhals/_compliant/expr.py

@@ -607,8 +607,8 @@ def arg_true(self) -> Self:
 
     def filter(self, *predicates: Self) -> Self:
         plx = self.__narwhals_namespace__()
-        other = plx.all_horizontal(*predicates)
-        return self._reuse_series_implementation("filter", other=other)
+        predicate = plx.all_horizontal(*predicates)
+        return self._reuse_series_implementation("filter", predicate=predicate)
 
     def drop_nulls(self) -> Self:
         return self._reuse_series_implementation("drop_nulls")

narwhals/_pandas_like/series.py

@@ -328,11 +328,13 @@ def arg_max(self: Self) -> int:
 
     # Binary comparisons
 
-    def filter(self: Self, other: Any) -> PandasLikeSeries:
-        if not (isinstance(other, list) and all(isinstance(x, bool) for x in other)):
-            _, other_native = align_and_extract_native(self, other)
+    def filter(self: Self, predicate: Any) -> PandasLikeSeries:
+        if not (
+            isinstance(predicate, list) and all(isinstance(x, bool) for x in predicate)
+        ):
+            _, other_native = align_and_extract_native(self, predicate)
         else:
-            other_native = other
+            other_native = predicate
         return self._from_native_series(self._native_series.loc[other_native]).alias(
             self.name
         )

narwhals/series.py

@@ -1578,7 +1578,7 @@ def __ror__(self: Self, other: Any) -> Self:
     def __invert__(self: Self) -> Self:
         return self._from_compliant_series(self._compliant_series.__invert__())
 
-    def filter(self: Self, other: Any) -> Self:
+    def filter(self: Self, predicate: Any) -> Self:
         """Filter elements in the Series based on a condition.
 
         Returns:
@@ -1597,7 +1597,7 @@ def filter(self: Self, other: Any) -> Self:
             dtype: int64
         """
         return self._from_compliant_series(
-            self._compliant_series.filter(self._extract_native(other))
+            self._compliant_series.filter(self._extract_native(predicate))
         )
 
     # --- descriptive ---