recover some column tests

Author: MarcoGorelli

dataframe_api_compat/polars_standard/__init__.py

@@ -198,7 +198,7 @@ def convert_to_standard_compliant_dataframe(
 
 def convert_to_standard_compliant_column(
     ser: pl.Series, api_version: str | None = None
-) -> PolarsColumn[Any]:
+) -> PolarsColumn[Any]:  # pragma: no cover  (todo: is this even needed?)
     return PolarsColumn(
         ser, dtype=ser.dtype, id_=None, api_version=api_version or LATEST_API_VERSION
     )

tests/column/column_test.py

@@ -6,17 +6,13 @@
 import polars as pl
 
 from dataframe_api_compat import pandas_standard
-from dataframe_api_compat import polars_standard
+from tests.utils import integer_dataframe_1
 
 
 def test_column_column() -> None:
-    result_pl = (
-        polars_standard.convert_to_standard_compliant_dataframe(
-            pl.DataFrame({"a": [1, 2, 3]}), "2023.08-beta"
-        )
-        .get_column_by_name("a")
-        .column
-    )
+    namespace = integer_dataframe_1("polars-lazy").__dataframe_namespace__()
+    ser = namespace.column_from_sequence([1, 2, 3], name="a", dtype=namespace.Int64())
+    result_pl = ser.column
     result_pl = cast(pl.Series, result_pl)
     pd.testing.assert_series_equal(result_pl.to_pandas(), pd.Series([1, 2, 3], name="a"))
     result_pd = (

tests/column/get_value_test.py

@@ -1,13 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from tests.utils import integer_series_1
 
-if TYPE_CHECKING:
-    import pytest
-
 
-def test_get_value(library: str, request: pytest.FixtureRequest) -> None:
-    result = integer_series_1(library, request).get_value(0)
+def test_get_value(library: str) -> None:
+    result = integer_series_1(library).get_value(0)
     assert result == 1

tests/column/len_test.py

@@ -1,13 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from tests.utils import integer_series_1
 
-if TYPE_CHECKING:
-    import pytest
-
 
-def test_column_len(library: str, request: pytest.FixtureRequest) -> None:
-    result = len(integer_series_1(library, request))
+def test_column_len(library: str) -> None:
+    result = len(integer_series_1(library))
     assert result == 3

tests/column/slice_rows_test.py

@@ -7,6 +7,7 @@
 
 from tests.utils import convert_series_to_pandas_numpy
 from tests.utils import integer_dataframe_3
+from tests.utils import interchange_to_pandas
 
 
 @pytest.mark.parametrize(
@@ -24,15 +25,14 @@ def test_column_slice_rows(
     stop: int | None,
     step: int | None,
     expected: pd.Series[Any],
-    request: pytest.FixtureRequest,
 ) -> None:
-    if library == "polars-lazy":
-        request.node.add_marker(pytest.mark.xfail())
-    ser = integer_dataframe_3(library).get_column_by_name("a")
-    namespace = ser.__column_namespace__()
+    namespace = integer_dataframe_3(library).__dataframe_namespace__()
+    ser = namespace.column_from_sequence(
+        [1, 2, 3, 4, 5, 6, 7], name="a", dtype=namespace.Int64()
+    )
     result = ser.slice_rows(start, stop, step)
-    result_pd = pd.api.interchange.from_dataframe(
-        namespace.dataframe_from_dict({"result": (result).rename("result")}).dataframe
+    result_pd = interchange_to_pandas(
+        namespace.dataframe_from_dict({"result": (result).rename("result")}), library
     )["result"]
     result_pd = convert_series_to_pandas_numpy(result_pd)
     pd.testing.assert_series_equal(result_pd, expected)

tests/column/statistics_test.py

@@ -19,6 +19,6 @@ def test_std(library: str, request: pytest.FixtureRequest) -> None:
     assert abs(result - 1.7320508075688772) < 1e-8
 
 
-def test_column_max(library: str, request: pytest.FixtureRequest) -> None:
-    result = integer_series_1(library, request).max()
+def test_column_max(library: str) -> None:
+    result = integer_series_1(library).max()
     assert result == 3

tests/conftest.py

@@ -6,5 +6,5 @@
 def pytest_generate_tests(metafunc: Any) -> None:
     if "library" in metafunc.fixturenames:
         metafunc.parametrize(
-            "library", ["pandas-numpy", "pandas-nullable", "polars", "polars-lazy"]
+            "library", ["pandas-numpy", "pandas-nullable", "polars-lazy"]
         )

tests/namespace/column_from_1d_array_test.py

@@ -23,10 +23,8 @@
     ],
 )
 def test_column_from_1d_array(
-    library: str, request: pytest.FixtureRequest, namespace_dtype: str, pandas_dtype: str
+    library: str, namespace_dtype: str, pandas_dtype: str
 ) -> None:
-    if library == "polars-lazy":
-        request.node.add_marker(pytest.mark.xfail())
     ser = integer_dataframe_1(library).get_column_by_name("a")
     namespace = ser.__column_namespace__()
     arr = np.array([1, 2, 3])
@@ -49,10 +47,8 @@ def test_column_from_1d_array(
     ],
 )
 def test_column_from_1d_array_string(
-    library: str, request: pytest.FixtureRequest, namespace_dtype: str, pandas_dtype: str
+    library: str, namespace_dtype: str, pandas_dtype: str
 ) -> None:
-    if library == "polars-lazy":
-        request.node.add_marker(pytest.mark.xfail())
     ser = integer_dataframe_1(library).get_column_by_name("a")
     namespace = ser.__column_namespace__()
     arr = np.array(["a", "b", "c"])
@@ -70,8 +66,7 @@ def test_column_from_1d_array_string(
 
 
 def test_column_from_array_invalid(library: str) -> None:
-    ser = integer_dataframe_1(library).get_column_by_name("a")
-    namespace = ser.__column_namespace__()
+    namespace = integer_dataframe_1(library).__dataframe_namespace__()
     arr = np.array(["a", "b", "c"])
     with pytest.raises(ValueError):
         namespace.column_from_1d_array(

tests/namespace/column_from_sequence_test.py

@@ -5,8 +5,8 @@
 import pandas as pd
 import pytest
 
-from tests.utils import convert_series_to_pandas_numpy
 from tests.utils import integer_dataframe_1
+from tests.utils import interchange_to_pandas
 
 
 @pytest.mark.parametrize(
@@ -47,6 +47,5 @@ def test_column_from_sequence(
             )
         }
     )
-    result_pd = pd.api.interchange.from_dataframe(result.dataframe)["result"]
-    result_pd = convert_series_to_pandas_numpy(result_pd)
+    result_pd = interchange_to_pandas(result, library)["result"]
     pd.testing.assert_series_equal(result_pd, expected)

tests/namespace/dataframe_from_2d_array_test.py

@@ -9,9 +9,7 @@
 from tests.utils import interchange_to_pandas
 
 
-def test_dataframe_from_2d_array(library: str, request: pytest.FixtureRequest) -> None:
-    if library == "polars-lazy":
-        request.node.add_marker(pytest.mark.xfail())
+def test_dataframe_from_2d_array(library: str) -> None:
     df = integer_dataframe_1(library)
     namespace = df.__dataframe_namespace__()
     arr = np.array([[1, 4], [2, 5], [3, 6]])