Merge branch 'main' into native-dataframe-sized

Author: dangotbanned

narwhals/_pandas_like/utils.py

@@ -545,7 +545,10 @@ def narwhals_to_native_dtype(  # noqa: C901, PLR0912, PLR0915
     if isinstance_or_issubclass(
         dtype, (dtypes.Struct, dtypes.Array, dtypes.List, dtypes.Time, dtypes.Binary)
     ):
-        if implementation is Implementation.PANDAS and backend_version >= (2, 2):
+        if implementation in {
+            Implementation.PANDAS,
+            Implementation.MODIN,
+        } and Implementation.PANDAS._backend_version() >= (2, 2):
             try:
                 import pandas as pd
                 import pyarrow as pa  # ignore-banned-import  # noqa: F401

tests/dtypes_test.py

@@ -143,7 +143,7 @@ def test_2d_array(constructor: Constructor, request: pytest.FixtureRequest) -> N
         if condition:
             pytest.skip(reason)
 
-    if any(x in str(constructor) for x in ("dask", "modin", "cudf", "pyspark")):
+    if any(x in str(constructor) for x in ("dask", "cudf", "pyspark")):
         request.applymarker(
             pytest.mark.xfail(
                 reason="2D array operations not supported in these backends"

tests/expr_and_series/cast_test.py

@@ -270,9 +270,7 @@ def test_cast_datetime_utc(
 
 
 def test_cast_struct(request: pytest.FixtureRequest, constructor: Constructor) -> None:
-    if any(
-        backend in str(constructor) for backend in ("dask", "modin", "cudf", "sqlframe")
-    ):
+    if any(backend in str(constructor) for backend in ("dask", "cudf", "sqlframe")):
         request.applymarker(pytest.mark.xfail)
 
     if "pandas" in str(constructor) and PANDAS_VERSION < (2, 2):
@@ -328,9 +326,7 @@ def test_cast_time(request: pytest.FixtureRequest, constructor: Constructor) ->
     if "pandas" in str(constructor) and PANDAS_VERSION < (2, 2):
         pytest.skip()
 
-    if any(
-        backend in str(constructor) for backend in ("dask", "pyspark", "modin", "cudf")
-    ):
+    if any(backend in str(constructor) for backend in ("dask", "pyspark", "cudf")):
         request.applymarker(pytest.mark.xfail)
 
     data = {"a": [time(12, 0, 0), time(12, 0, 5)]}
@@ -343,7 +339,7 @@ def test_cast_binary(request: pytest.FixtureRequest, constructor: Constructor) -
     if "pandas" in str(constructor) and PANDAS_VERSION < (2, 2):
         pytest.skip()
 
-    if any(backend in str(constructor) for backend in ("cudf", "dask", "modin")):
+    if any(backend in str(constructor) for backend in ("cudf", "dask")):
         request.applymarker(pytest.mark.xfail)
 
     data = {"a": ["test1", "test2"]}

tests/expr_and_series/list/len_test.py

@@ -11,7 +11,7 @@
 
 
 def test_len_expr(request: pytest.FixtureRequest, constructor: Constructor) -> None:
-    if any(backend in str(constructor) for backend in ("dask", "modin", "cudf")):
+    if any(backend in str(constructor) for backend in ("dask", "cudf")):
         request.applymarker(pytest.mark.xfail)
 
     if "pandas" in str(constructor) and PANDAS_VERSION < (2, 2):
@@ -27,7 +27,7 @@ def test_len_expr(request: pytest.FixtureRequest, constructor: Constructor) -> N
 def test_len_series(
     request: pytest.FixtureRequest, constructor_eager: ConstructorEager
 ) -> None:
-    if any(backend in str(constructor_eager) for backend in ("modin", "cudf")):
+    if "cudf" in str(constructor_eager):
         request.applymarker(pytest.mark.xfail)
 
     if "pandas" in str(constructor_eager) and PANDAS_VERSION < (2, 2):

tests/expr_and_series/list/unique_test.py

@@ -16,9 +16,8 @@
 def test_unique_expr(request: pytest.FixtureRequest, constructor: Constructor) -> None:
     if any(
         backend in str(constructor)
-        for backend in ("dask", "modin", "cudf", "pyarrow", "pandas", "sqlframe")
+        for backend in ("dask", "modin", "cudf", "pyarrow", "pandas")
     ):
-        # sqlframe issue: https://github.com/eakmanrq/sqlframe/issues/460
         request.applymarker(pytest.mark.xfail)
     result = (
         nw.from_native(constructor(data))

tests/frame/explode_test.py

@@ -35,10 +35,7 @@ def test_explode_single_col(
     column: str,
     expected_values: list[int | None],
 ) -> None:
-    if any(
-        backend in str(constructor)
-        for backend in ("dask", "modin", "cudf", "pyarrow_table")
-    ):
+    if any(backend in str(constructor) for backend in ("dask", "cudf", "pyarrow_table")):
         request.applymarker(pytest.mark.xfail)
 
     if "pandas" in str(constructor) and PANDAS_VERSION < (2, 2):
@@ -87,15 +84,7 @@ def test_explode_multiple_cols(
 ) -> None:
     if any(
         backend in str(constructor)
-        for backend in (
-            "dask",
-            "modin",
-            "cudf",
-            "pyarrow_table",
-            "duckdb",
-            "pyspark",
-            "ibis",
-        )
+        for backend in ("dask", "cudf", "pyarrow_table", "duckdb", "pyspark", "ibis")
     ):
         request.applymarker(pytest.mark.xfail)
 
@@ -114,10 +103,7 @@ def test_explode_multiple_cols(
 def test_explode_shape_error(
     request: pytest.FixtureRequest, constructor: Constructor
 ) -> None:
-    if any(
-        backend in str(constructor)
-        for backend in ("dask", "modin", "cudf", "pyarrow_table")
-    ):
+    if any(backend in str(constructor) for backend in ("dask", "cudf", "pyarrow_table")):
         request.applymarker(pytest.mark.xfail)
 
     if "pandas" in str(constructor) and PANDAS_VERSION < (2, 2):

tests/frame/getitem_test.py

@@ -8,7 +8,7 @@
 import pytest
 
 import narwhals as nw
-from tests.utils import ConstructorEager, assert_equal_data
+from tests.utils import PANDAS_VERSION, ConstructorEager, assert_equal_data
 
 if TYPE_CHECKING:
     from narwhals.typing import _1DArray
@@ -301,9 +301,12 @@ def test_triple_tuple(constructor_eager: ConstructorEager) -> None:
 def test_slice_with_series(
     constructor_eager: ConstructorEager, request: pytest.FixtureRequest
 ) -> None:
-    if "pandas_pyarrow" in str(constructor_eager):
-        # https://github.com/pandas-dev/pandas/issues/61311
-        request.applymarker(pytest.mark.xfail)
+    request.applymarker(
+        pytest.mark.xfail(
+            "pandas_pyarrow" in str(constructor_eager) and PANDAS_VERSION < (3,),
+            reason="https://github.com/pandas-dev/pandas/issues/61311",
+        )
+    )
     data = {"a": [1, 2, 3], "c": [0, 2, 1]}
     nw_df = nw.from_native(constructor_eager(data), eager_only=True)
     result = nw_df[nw_df["c"]]
@@ -325,9 +328,12 @@ def test_horizontal_slice_with_series(constructor_eager: ConstructorEager) -> No
 def test_horizontal_slice_with_series_2(
     constructor_eager: ConstructorEager, request: pytest.FixtureRequest
 ) -> None:
-    if "pandas_pyarrow" in str(constructor_eager):
-        # https://github.com/pandas-dev/pandas/issues/61311
-        request.applymarker(pytest.mark.xfail)
+    request.applymarker(
+        pytest.mark.xfail(
+            "pandas_pyarrow" in str(constructor_eager) and PANDAS_VERSION < (3,),
+            reason="https://github.com/pandas-dev/pandas/issues/61311",
+        )
+    )
     data = {"a": [1, 2], "c": [0, 2], "d": ["c", "a"]}
     nw_df = nw.from_native(constructor_eager(data), eager_only=True)
     result = nw_df[:, nw_df["c"]]