Skip to content

Commit

Permalink
feat: from_native raise invalid comb (#519)
Browse files Browse the repository at this point in the history
  • Loading branch information
FBruzzesi authored Jul 14, 2024
1 parent 6db70d6 commit 6dbfe6c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
4 changes: 3 additions & 1 deletion narwhals/translate.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,10 @@ def from_native( # noqa: PLR0915
from narwhals.utils import parse_version

if series_only:
if allow_series is False:
msg = "Invalid parameter combination: `series_only=True` and `allow_series=False`"
raise ValueError(msg)
allow_series = True
# TODO(Unassigned): raise on invalid combinations

if (pl := get_polars()) is not None and isinstance(native_object, pl.DataFrame):
if series_only:
Expand Down
8 changes: 8 additions & 0 deletions tests/translate/from_native_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@ def test_allow_series(series: Any, allow_series: Any, context: Any) -> None:
assert isinstance(res, nw.Series)


def test_invalid_series_combination() -> None:
with pytest.raises(
ValueError,
match="Invalid parameter combination: `series_only=True` and `allow_series=False`",
):
nw.from_native(MockSeries(), series_only=True, allow_series=False) # type: ignore[call-overload]


def test_pandas_like_validate() -> None:
df1 = pd.DataFrame({"a": [1, 2, 3]})
df2 = pd.DataFrame({"b": [1, 2, 3]})
Expand Down

0 comments on commit 6dbfe6c

Please sign in to comment.