chore: clean assorted (#2787)

* clean assorted

* typo

Author: MarcoGorelli

tests/expr_and_series/str/to_datetime_test.py

@@ -151,7 +151,7 @@ def test_to_datetime_series_infer_fmt(
 def test_to_datetime_infer_fmt_from_date(
     constructor: Constructor, request: pytest.FixtureRequest
 ) -> None:
-    if "duckdb" in str(constructor) or "ibis" in str(constructor):
+    if any(x in str(constructor) for x in ("duckdb", "ibis")):
         request.applymarker(pytest.mark.xfail)
     data = {"z": ["2020-01-01", "2020-01-02", None]}
     if "pyspark" in str(constructor):

tests/expr_and_series/unary_test.py

@@ -156,7 +156,7 @@ def test_unary_one_element(
 
 def test_unary_one_element_series(constructor_eager: ConstructorEager) -> None:
     data = {"a": [1], "b": [2], "c": [None]}
-    df = nw.from_native(constructor_eager(data))
+    df = nw.from_native(constructor_eager(data), eager_only=True)
     result = {
         "a_nunique": [df["a"].n_unique()],
         "a_skew": [df["a"].skew()],

tests/frame/group_by_test.py

@@ -284,12 +284,8 @@ def test_no_agg(constructor: Constructor) -> None:
 
 
 def test_group_by_categorical(constructor: Constructor) -> None:
-    if (
-        ("pyspark" in str(constructor))
-        or "duckdb" in str(constructor)
-        or "ibis" in str(constructor)
-    ):
-        pytest.skip(reason="DuckDB, PySpark, and Ibis do not support categorical types")
+    if any(x in str(constructor) for x in ("pyspark", "duckdb", "ibis")):
+        pytest.skip(reason="no categorical support")
     if "pyarrow_table" in str(constructor) and PYARROW_VERSION < (
         15,
     ):  # pragma: no cover

tests/v1_test.py

@@ -260,12 +260,9 @@ def test_cast_to_enum_v1(
     request: pytest.FixtureRequest, constructor: Constructor
 ) -> None:
     # Backends that do not (yet) support Enum dtype
-    if (
-        any(
-            backend in str(constructor)
-            for backend in ["pyarrow_table", "sqlframe", "pyspark", "ibis"]
-        )
-        or str(constructor) == "modin"
+    if any(
+        backend in str(constructor)
+        for backend in ("pyarrow_table", "sqlframe", "pyspark", "ibis")
     ):
         request.applymarker(pytest.mark.xfail)
 

tpch/execute.py

@@ -38,7 +38,9 @@
     "sqlframe": (sqlframe, {"session": DuckDBSession()}),
 }
 
-DUCKDB_SKIPS = ["q15"]
+DUCKDB_SKIPS = [
+    "q15"  # needs `filter` which works with window expressions
+]
 
 QUERY_DATA_PATH_MAP = {
     "q1": (LINEITEM_PATH,),

tpch/queries/q14.py

@@ -19,7 +19,7 @@ def query(line_item_ds: FrameT, part_ds: FrameT) -> FrameT:
         .select(
             (
                 100.00
-                * nw.when(nw.col("p_type").str.contains("PROMO*"))
+                * nw.when(nw.col("p_type").str.starts_with("PROMO"))
                 .then(nw.col("l_extendedprice") * (1 - nw.col("l_discount")))
                 .otherwise(0)
                 .sum()

tpch/queries/q9.py

@@ -26,7 +26,7 @@ def query(
         )
         .join(orders_ds, left_on="l_orderkey", right_on="o_orderkey")
         .join(nation_ds, left_on="s_nationkey", right_on="n_nationkey")
-        .filter(nw.col("p_name").str.contains("green"))
+        .filter(nw.col("p_name").str.contains("green", literal=True))
         .select(
             nw.col("n_name").alias("nation"),
             nw.col("o_orderdate").dt.year().alias("o_year"),