Merge branch 'main' into oh-nodes

Author: dangotbanned

tests/dtypes_test.py

@@ -485,7 +485,7 @@ def test_datetime_w_tz_duckdb() -> None:
 
 
 def test_datetime_w_tz_pyspark(constructor: Constructor) -> None:  # pragma: no cover
-    if "pyspark" not in str(constructor):
+    if "pyspark" not in str(constructor) or "sqlframe" in str(constructor):
         pytest.skip()
     pytest.importorskip("pyspark")
     pytest.importorskip("zoneinfo")

tests/expr_and_series/dt/convert_time_zone_test.py

@@ -158,7 +158,7 @@ def test_convert_time_zone_to_connection_tz_duckdb() -> None:
 def test_convert_time_zone_to_connection_tz_pyspark(
     constructor: Constructor,
 ) -> None:  # pragma: no cover
-    if "pyspark" not in str(constructor):
+    if "pyspark" not in str(constructor) or "sqlframe" in str(constructor):
         pytest.skip()
     pytest.importorskip("pyspark")
     pytest.importorskip("zoneinfo")

tests/expr_and_series/dt/replace_time_zone_test.py

@@ -149,7 +149,7 @@ def test_replace_time_zone_to_connection_tz_duckdb() -> None:
 def test_replace_time_zone_to_connection_tz_pyspark(
     constructor: Constructor,
 ) -> None:  # pragma: no cover
-    if "pyspark" not in str(constructor):
+    if "pyspark" not in str(constructor) or "sqlframe" in str(constructor):
         pytest.skip()
     pytest.importorskip("pyspark")
     pytest.importorskip("zoneinfo")