Skip to content

Commit 4176a67

Browse files
authored
Merge branch 'main' into series-from-numpy
2 parents 6ebbad2 + b502c2d commit 4176a67

File tree

8 files changed

+1
-18
lines changed

8 files changed

+1
-18
lines changed

narwhals/_arrow/dataframe.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,6 @@ def lazy(self: Self, *, backend: Implementation | None = None) -> CompliantLazyF
601601
df=duckdb.table("df"),
602602
backend_version=parse_version(duckdb),
603603
version=self._version,
604-
validate_column_names=False,
605604
)
606605
elif backend is Implementation.POLARS:
607606
import polars as pl # ignore-banned-import
@@ -623,7 +622,6 @@ def lazy(self: Self, *, backend: Implementation | None = None) -> CompliantLazyF
623622
native_dataframe=dd.from_pandas(self._native_frame.to_pandas()),
624623
backend_version=parse_version(dask),
625624
version=self._version,
626-
validate_column_names=False,
627625
)
628626
raise AssertionError # pragma: no cover
629627

narwhals/_dask/dataframe.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ def __init__(
4242
*,
4343
backend_version: tuple[int, ...],
4444
version: Version,
45-
# Unused, just for compatibility. We only validate when collecting.
46-
validate_column_names: bool = False,
4745
) -> None:
4846
self._native_frame: dd.DataFrame = native_dataframe
4947
self._backend_version = backend_version

narwhals/_duckdb/dataframe.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ def __init__(
5050
*,
5151
backend_version: tuple[int, ...],
5252
version: Version,
53-
# Unused, just for compatibility. We only validate when collecting.
54-
validate_column_names: bool = False,
5553
) -> None:
5654
self._native_frame: duckdb.DuckDBPyRelation = df
5755
self._version = version

narwhals/_duckdb/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def maybe_evaluate_expr(
3131
msg = "Multi-output expressions (e.g. `nw.all()` or `nw.col('a', 'b')`) not supported in this context"
3232
raise ValueError(msg)
3333
return column_results[0]
34-
return duckdb.ConstantExpression(obj)
34+
return lit(obj)
3535

3636

3737
def evaluate_exprs(

narwhals/_pandas_like/dataframe.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,6 @@ def lazy(self: Self, *, backend: Implementation | None = None) -> CompliantLazyF
798798
df=duckdb.table("pandas_df"),
799799
backend_version=parse_version(duckdb),
800800
version=self._version,
801-
validate_column_names=False,
802801
)
803802
elif backend is Implementation.POLARS:
804803
import polars as pl # ignore-banned-import
@@ -820,7 +819,6 @@ def lazy(self: Self, *, backend: Implementation | None = None) -> CompliantLazyF
820819
native_dataframe=dd.from_pandas(pandas_df),
821820
backend_version=parse_version(dask),
822821
version=self._version,
823-
validate_column_names=False,
824822
)
825823
raise AssertionError # pragma: no cover
826824

narwhals/_polars/dataframe.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ def lazy(self: Self, *, backend: Implementation | None = None) -> CompliantLazyF
274274
df=duckdb.table("df"),
275275
backend_version=parse_version(duckdb),
276276
version=self._version,
277-
validate_column_names=False,
278277
)
279278
elif backend is Implementation.DASK:
280279
import dask # ignore-banned-import
@@ -286,7 +285,6 @@ def lazy(self: Self, *, backend: Implementation | None = None) -> CompliantLazyF
286285
native_dataframe=dd.from_pandas(self._native_frame.to_pandas()),
287286
backend_version=parse_version(dask),
288287
version=self._version,
289-
validate_column_names=False,
290288
)
291289
raise AssertionError # pragma: no cover
292290

narwhals/_spark_like/dataframe.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ def __init__(
5555
backend_version: tuple[int, ...],
5656
version: Version,
5757
implementation: Implementation,
58-
# Unused, just for compatibility. We only validate when collecting.
59-
validate_column_names: bool = False,
6058
) -> None:
6159
self._native_frame: SQLFrameDataFrame = native_dataframe
6260
self._backend_version = backend_version

narwhals/translate.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,6 @@ def _from_native_impl( # noqa: PLR0915
647647
native_object,
648648
backend_version=parse_version(get_dask()),
649649
version=version,
650-
validate_column_names=True,
651650
),
652651
level="lazy",
653652
)
@@ -674,7 +673,6 @@ def _from_native_impl( # noqa: PLR0915
674673
native_object,
675674
backend_version=backend_version,
676675
version=version,
677-
validate_column_names=True,
678676
),
679677
level="interchange",
680678
)
@@ -683,7 +681,6 @@ def _from_native_impl( # noqa: PLR0915
683681
native_object,
684682
backend_version=backend_version,
685683
version=version,
686-
validate_column_names=True,
687684
),
688685
level="lazy",
689686
)
@@ -735,7 +732,6 @@ def _from_native_impl( # noqa: PLR0915
735732
backend_version=parse_version(get_pyspark()),
736733
version=version,
737734
implementation=Implementation.PYSPARK,
738-
validate_column_names=True,
739735
),
740736
level="lazy",
741737
)
@@ -758,7 +754,6 @@ def _from_native_impl( # noqa: PLR0915
758754
backend_version=backend_version,
759755
version=version,
760756
implementation=Implementation.SQLFRAME,
761-
validate_column_names=True,
762757
),
763758
level="lazy",
764759
)

0 commit comments

Comments
 (0)