Merge branch 'main' into fix-typing-time-units

narwhals-dev · Feb 15, 2025 · 3c66a93 · 3c66a93
2 parents b38403c + bca1c8b
commit 3c66a93
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/narwhals/_arrow/selectors.py b/narwhals/_arrow/selectors.py
@@ -136,7 +136,7 @@ def func(df: ArrowDataFrame) -> list[ArrowSeries]:
                 )
             ]
 
-        def evalute_output_names(df: ArrowDataFrame) -> Sequence[str]:
+        def evaluate_output_names(df: ArrowDataFrame) -> Sequence[str]:
             return [
                 col
                 for col in df.columns
@@ -152,7 +152,7 @@ def evalute_output_names(df: ArrowDataFrame) -> Sequence[str]:
             func,
             depth=0,
             function_name="selector",
-            evaluate_output_names=evalute_output_names,
+            evaluate_output_names=evaluate_output_names,
             alias_output_names=None,
             backend_version=self._backend_version,
             version=self._version,

diff --git a/narwhals/_dask/selectors.py b/narwhals/_dask/selectors.py
@@ -150,7 +150,7 @@ def func(df: DaskLazyFrame) -> list[dx.Series]:
                 )
             ]
 
-        def evalute_output_names(df: DaskLazyFrame) -> Sequence[str]:
+        def evaluate_output_names(df: DaskLazyFrame) -> Sequence[str]:
             return [
                 col
                 for col in df.columns
@@ -166,7 +166,7 @@ def evalute_output_names(df: DaskLazyFrame) -> Sequence[str]:
             func,
             depth=0,
             function_name="selector",
-            evaluate_output_names=evalute_output_names,
+            evaluate_output_names=evaluate_output_names,
             alias_output_names=None,
             backend_version=self._backend_version,
             returns_scalar=False,

diff --git a/narwhals/_duckdb/selectors.py b/narwhals/_duckdb/selectors.py
@@ -138,7 +138,7 @@ def func(df: DuckDBLazyFrame) -> list[duckdb.Expression]:
                 )
             ]
 
-        def evalute_output_names(df: DuckDBLazyFrame) -> Sequence[str]:
+        def evaluate_output_names(df: DuckDBLazyFrame) -> Sequence[str]:
             return [
                 col
                 for col in df.columns
@@ -153,7 +153,7 @@ def evalute_output_names(df: DuckDBLazyFrame) -> Sequence[str]:
         return DuckDBSelector(
             func,
             function_name="selector",
-            evaluate_output_names=evalute_output_names,
+            evaluate_output_names=evaluate_output_names,
             alias_output_names=None,
             backend_version=self._backend_version,
             expr_kind=ExprKind.TRANSFORM,

diff --git a/narwhals/_pandas_like/selectors.py b/narwhals/_pandas_like/selectors.py
@@ -143,7 +143,7 @@ def func(df: PandasLikeDataFrame) -> list[PandasLikeSeries]:
                 )
             ]
 
-        def evalute_output_names(df: PandasLikeDataFrame) -> Sequence[str]:
+        def evaluate_output_names(df: PandasLikeDataFrame) -> Sequence[str]:
             return [
                 col
                 for col in df.columns
@@ -159,7 +159,7 @@ def evalute_output_names(df: PandasLikeDataFrame) -> Sequence[str]:
             func,
             depth=0,
             function_name="selector",
-            evaluate_output_names=evalute_output_names,
+            evaluate_output_names=evaluate_output_names,
             alias_output_names=None,
             implementation=self._implementation,
             backend_version=self._backend_version,

diff --git a/narwhals/_spark_like/selectors.py b/narwhals/_spark_like/selectors.py
@@ -141,7 +141,7 @@ def func(df: SparkLikeLazyFrame) -> list[Column]:
                 )
             ]
 
-        def evalute_output_names(df: SparkLikeLazyFrame) -> Sequence[str]:
+        def evaluate_output_names(df: SparkLikeLazyFrame) -> Sequence[str]:
             return [
                 col
                 for col in df.columns
@@ -156,7 +156,7 @@ def evalute_output_names(df: SparkLikeLazyFrame) -> Sequence[str]:
         return SparkLikeSelector(
             func,
             function_name="selector",
-            evaluate_output_names=evalute_output_names,
+            evaluate_output_names=evaluate_output_names,
             alias_output_names=None,
             backend_version=self._backend_version,
             expr_kind=ExprKind.TRANSFORM,

diff --git a/narwhals/dataframe.py b/narwhals/dataframe.py
@@ -227,12 +227,11 @@ def join(
         right_on: str | list[str] | None = None,
         suffix: str = "_right",
     ) -> Self:
-        _supported_joins = ("inner", "left", "cross", "anti", "semi")
         on = [on] if isinstance(on, str) else on
         left_on = [left_on] if isinstance(left_on, str) else left_on
         right_on = [right_on] if isinstance(right_on, str) else right_on
 
-        if how not in _supported_joins:
+        if how not in (_supported_joins := ("inner", "left", "cross", "anti", "semi")):
             msg = f"Only the following join strategies are supported: {_supported_joins}; found '{how}'."
             raise NotImplementedError(msg)