chore: more v1 test suite cleanups (#2822)

Author: MarcoGorelli

tests/dependencies/is_narwhals_dataframe_test.py

@@ -3,7 +3,6 @@
 from typing import TYPE_CHECKING
 
 import narwhals as nw
-import narwhals.stable.v1 as nw_v1
 from narwhals.stable.v1.dependencies import is_narwhals_dataframe
 
 if TYPE_CHECKING:
@@ -14,5 +13,4 @@ def test_is_narwhals_dataframe(constructor_eager: ConstructorEager) -> None:
     df = constructor_eager({"col1": [1, 2], "col2": [3, 4]})
 
     assert is_narwhals_dataframe(nw.from_native(df))
-    assert is_narwhals_dataframe(nw_v1.from_native(df))
     assert not is_narwhals_dataframe(df)

tests/dependencies/is_narwhals_series_test.py

@@ -3,7 +3,6 @@
 from typing import TYPE_CHECKING
 
 import narwhals as nw
-import narwhals.stable.v1 as nw_v1
 from narwhals.stable.v1.dependencies import is_narwhals_series
 
 if TYPE_CHECKING:
@@ -14,5 +13,4 @@ def test_is_narwhals_series(constructor_eager: ConstructorEager) -> None:
     df = constructor_eager({"col1": [1, 2], "col2": [3, 4]})
 
     assert is_narwhals_series(nw.from_native(df, eager_only=True)["col1"])
-    assert is_narwhals_series(nw_v1.from_native(df, eager_only=True)["col1"])
     assert not is_narwhals_series(nw.from_native(df, eager_only=True)["col1"].to_native())

tests/expr_and_series/order_dependent_lazy_test.py

@@ -2,13 +2,10 @@
 
 from typing import TYPE_CHECKING
 
-import pandas as pd
 import pytest
 
 import narwhals as nw
-import narwhals.stable.v1 as nw_v1
 from narwhals.exceptions import InvalidOperationError
-from tests.utils import assert_equal_data
 
 if TYPE_CHECKING:
     from tests.utils import Constructor
@@ -29,35 +26,3 @@ def test_order_dependent_raises_in_lazy(constructor: Constructor) -> None:
     for agg in ["any", "all"]:
         with pytest.raises(InvalidOperationError, match="Order-dependent expressions"):
             lf.select(getattr((nw.col("a").diff() > 0), agg)())
-
-
-def test_dask_order_dependent_ops() -> None:
-    # Preserve these for narwhals.stable.v1, even though they
-    # raise after stable.v1.
-    pytest.importorskip("dask")
-    import dask.dataframe as dd
-
-    df = nw_v1.from_native(dd.from_pandas(pd.DataFrame({"a": [1, 2, 3]})))
-    result = df.select(
-        a=nw.col("a").cum_sum(),
-        b=nw.col("a").cum_count(),
-        c=nw.col("a").cum_prod(),
-        d=nw.col("a").cum_max(),
-        e=nw.col("a").cum_min(),
-        f=nw.col("a").shift(1),
-        g=nw.col("a").diff(),
-        h=nw.col("a").is_first_distinct(),
-        i=nw.col("a").is_last_distinct(),
-    )
-    expected = {
-        "a": [1, 3, 6],
-        "b": [1, 2, 3],
-        "c": [1, 2, 6],
-        "d": [1, 2, 3],
-        "e": [1, 1, 1],
-        "f": [None, 1.0, 2.0],
-        "g": [None, 1.0, 1.0],
-        "h": [True, True, True],
-        "i": [True, True, True],
-    }
-    assert_equal_data(result, expected)

tests/series_only/gather_every_test.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-import narwhals.stable.v1 as nw_v1
+import narwhals as nw
 from tests.utils import ConstructorEager, assert_equal_data
 
 data = {"a": list(range(10))}
@@ -13,7 +13,7 @@
 def test_gather_every_series(
     constructor_eager: ConstructorEager, n: int, offset: int
 ) -> None:
-    series = nw_v1.from_native(constructor_eager(data), eager_only=True)["a"]
+    series = nw.from_native(constructor_eager(data), eager_only=True)["a"]
 
     result = series.gather_every(n=n, offset=offset)
     expected = data["a"][offset::n]

tests/series_only/head_test.py

@@ -2,13 +2,13 @@
 
 import pytest
 
-import narwhals.stable.v1 as nw_v1
+import narwhals as nw
 from tests.utils import ConstructorEager, assert_equal_data
 
 
 @pytest.mark.parametrize("n", [2, -1])
 def test_head_series(constructor_eager: ConstructorEager, n: int) -> None:
-    df = nw_v1.from_native(constructor_eager({"a": [1, 2, 3]}), eager_only=True)
+    df = nw.from_native(constructor_eager({"a": [1, 2, 3]}), eager_only=True)
     result = df.select(df["a"].head(n))
     expected = {"a": [1, 2]}
     assert_equal_data(result, expected)

tests/series_only/sort_test.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-import narwhals.stable.v1 as nw_v1
+import narwhals as nw
 
 if TYPE_CHECKING:
     from tests.utils import ConstructorEager
@@ -24,9 +24,8 @@
 def test_sort_series(
     constructor_eager: ConstructorEager, descending: Any, nulls_last: Any, expected: Any
 ) -> None:
-    series = nw_v1.from_native(constructor_eager(data), eager_only=True)["b"]
+    series = nw.from_native(constructor_eager(data), eager_only=True)["b"]
     result = series.sort(descending=descending, nulls_last=nulls_last)
     assert (
-        result
-        == nw_v1.from_native(constructor_eager({"a": expected}), eager_only=True)["a"]
+        result == nw.from_native(constructor_eager({"a": expected}), eager_only=True)["a"]
     )

tests/series_only/tail_test.py

@@ -2,13 +2,13 @@
 
 import pytest
 
-import narwhals.stable.v1 as nw_v1
+import narwhals as nw
 from tests.utils import ConstructorEager, assert_equal_data
 
 
 @pytest.mark.parametrize("n", [2, -1])
 def test_tail_series(constructor_eager: ConstructorEager, n: int) -> None:
-    df = nw_v1.from_native(constructor_eager({"a": [1, 2, 3]}), eager_only=True)
+    df = nw.from_native(constructor_eager({"a": [1, 2, 3]}), eager_only=True)
     result = df.select(df["a"].tail(n))
     expected = {"a": [2, 3]}
     assert_equal_data(result, expected)

tests/translate/from_native_test.py

@@ -23,12 +23,11 @@
 from contextlib import nullcontext as does_not_raise
 from importlib.util import find_spec
 from itertools import chain
-from typing import TYPE_CHECKING, Any, Callable, Literal, cast
+from typing import TYPE_CHECKING, Any, Literal, cast
 
 import pytest
 
 import narwhals as nw
-import narwhals.stable.v1 as nw_v1
 from narwhals._utils import Version
 from tests.utils import Constructor, maybe_get_modin_df
 
@@ -409,9 +408,6 @@ def _iter_roundtrip_cases(iterable: Iterable[Any], **kwds: Any) -> Iterator[Para
             yield pytest.param(element, kwds, id=f"{tp.__module__}.{tp.__qualname__}")
 
 
-@pytest.mark.parametrize(
-    "from_native", [nw.from_native, nw_v1.from_native], ids=["MAIN", "V1"]
-)
 @pytest.mark.parametrize(
     ("native", "kwds"),
     list(
@@ -421,10 +417,8 @@ def _iter_roundtrip_cases(iterable: Iterable[Any], **kwds: Any) -> Iterator[Para
         )
     ),
 )
-def test_from_native_roundtrip_identity(
-    from_native: Callable[..., Any], native: Any, kwds: dict[str, Any]
-) -> None:
-    nw_wrapped = from_native(native, **kwds)
+def test_from_native_roundtrip_identity(native: Any, kwds: dict[str, Any]) -> None:
+    nw_wrapped = nw.from_native(native, **kwds)
     roundtrip = nw_wrapped.to_native()
     assert roundtrip is native
 

tests/v1_test.py

@@ -914,3 +914,35 @@ def test_deprecated_expr_methods() -> None:
             e=(nw.col("a") == 0).arg_true(),
             f=nw.col("a").gather_every(2),
         )
+
+
+def test_dask_order_dependent_ops() -> None:
+    # Preserve these for narwhals.stable.v1, even though they
+    # raise after stable.v1.
+    pytest.importorskip("dask")
+    import dask.dataframe as dd
+
+    df = nw_v1.from_native(dd.from_pandas(pd.DataFrame({"a": [1, 2, 3]})))
+    result = df.select(
+        a=nw_v1.col("a").cum_sum(),
+        b=nw_v1.col("a").cum_count(),
+        c=nw_v1.col("a").cum_prod(),
+        d=nw_v1.col("a").cum_max(),
+        e=nw_v1.col("a").cum_min(),
+        f=nw_v1.col("a").shift(1),
+        g=nw_v1.col("a").diff(),
+        h=nw_v1.col("a").is_first_distinct(),
+        i=nw_v1.col("a").is_last_distinct(),
+    )
+    expected = {
+        "a": [1, 3, 6],
+        "b": [1, 2, 3],
+        "c": [1, 2, 6],
+        "d": [1, 2, 3],
+        "e": [1, 1, 1],
+        "f": [None, 1.0, 2.0],
+        "g": [None, 1.0, 1.0],
+        "h": [True, True, True],
+        "i": [True, True, True],
+    }
+    assert_equal_data(result, expected)