chore(deps): lock file maintenance

ibis/backends/dask/tests/test_operations.py

@@ -7,11 +7,13 @@
 import numpy.testing as npt
 import pandas as pd
 import pytest
+from packaging.version import parse as vparse
 from pytest import param
 
 import ibis
 import ibis.expr.datatypes as dt
 
+dask = pytest.importorskip("dask")
 da = pytest.importorskip("dask.array")
 dd = pytest.importorskip("dask.dataframe")
 
@@ -446,7 +448,10 @@ def test_series_limit(t, df, offset):
     )
 
 
-@pytest.mark.xfail(reason="TODO - sorting - #2553")
+@pytest.mark.xfail(
+    condition=vparse(dask.__version__) < vparse("2024.2.0"),
+    reason="not implemented until 2024.2.0",
+)
 def test_complex_order_by(t, df):
     expr = t.order_by([ibis.desc(t.plain_int64 * t.plain_float64), t.plain_float64])
     result = expr.compile()

ibis/backends/flink/compiler.py

@@ -8,7 +8,7 @@
 import ibis.common.exceptions as com
 import ibis.expr.datatypes as dt
 import ibis.expr.operations as ops
-from ibis.backends.base.sqlglot.compiler import STAR, SQLGlotCompiler, paren
+from ibis.backends.base.sqlglot.compiler import NULL, STAR, SQLGlotCompiler, paren
 from ibis.backends.base.sqlglot.datatypes import FlinkType
 from ibis.backends.base.sqlglot.dialects import Flink
 from ibis.backends.base.sqlglot.rewrites import (
@@ -292,12 +292,12 @@ def visit_Literal(self, op, *, value, dtype):
         if value is None:
             assert dtype.nullable, "dtype is not nullable but value is None"
             if not dtype.is_null():
-                return self.cast(sge.NULL, dtype)
-            return sge.NULL
+                return self.cast(NULL, dtype)
+            return NULL
         return super().visit_Literal(op, value=value, dtype=dtype)
 
     def visit_MapGet(self, op, *, arg, key, default):
-        if default is sge.NULL:
+        if default is NULL:
             default = self.cast(default, op.dtype)
         return self.f.coalesce(arg[key], default)
 
@@ -422,10 +422,10 @@ def visit_Cast(self, op, *, arg, to):
     def visit_IfElse(self, op, *, bool_expr, true_expr, false_null_expr):
         return self.if_(
             bool_expr,
-            true_expr if true_expr != sge.NULL else self.cast(true_expr, op.dtype),
+            true_expr if true_expr != NULL else self.cast(true_expr, op.dtype),
             (
                 false_null_expr
-                if false_null_expr != sge.NULL
+                if false_null_expr != NULL
                 else self.cast(false_null_expr, op.dtype)
             ),
         )

ibis/backends/postgres/tests/snapshots/test_geospatial/test_geo_literals_smoke/multipoint-geography/out.sql

@@ -1,6 +1,6 @@
 SELECT
-  ST_ASEWKB("t0"."<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>") AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
+  ST_ASEWKB("t0"."<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>") AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
 FROM (
   SELECT
-    ST_GEOMFROMTEXT('MULTIPOINT ((10 40), (40 30), (20 20), (30 10))', 4326) AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
+    ST_GEOMFROMTEXT('MULTIPOINT (10 40, 40 30, 20 20, 30 10)', 4326) AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
 ) AS "t0"

ibis/backends/postgres/tests/snapshots/test_geospatial/test_geo_literals_smoke/multipoint-geometry/out.sql

@@ -1,6 +1,6 @@
 SELECT
-  ST_ASEWKB("t0"."<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>") AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
+  ST_ASEWKB("t0"."<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>") AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
 FROM (
   SELECT
-    ST_GEOMFROMTEXT('MULTIPOINT ((10 40), (40 30), (20 20), (30 10))', 4326) AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
+    ST_GEOMFROMTEXT('MULTIPOINT (10 40, 40 30, 20 20, 30 10)', 4326) AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
 ) AS "t0"

ibis/backends/postgres/tests/snapshots/test_geospatial/test_geo_literals_smoke/multipoint-none/out.sql

@@ -1,6 +1,6 @@
 SELECT
-  ST_ASEWKB("t0"."<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>") AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
+  ST_ASEWKB("t0"."<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>") AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
 FROM (
   SELECT
-    ST_GEOMFROMTEXT('MULTIPOINT ((10 40), (40 30), (20 20), (30 10))') AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
+    ST_GEOMFROMTEXT('MULTIPOINT (10 40, 40 30, 20 20, 30 10)') AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
 ) AS "t0"

ibis/backends/postgres/tests/snapshots/test_geospatial/test_geo_literals_smoke/multipoint-srid/out.sql

@@ -1,6 +1,6 @@
 SELECT
-  ST_ASEWKB("t0"."<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>") AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
+  ST_ASEWKB("t0"."<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>") AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
 FROM (
   SELECT
-    ST_GEOMFROMTEXT('MULTIPOINT ((10 40), (40 30), (20 20), (30 10))', 4326) AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
+    ST_GEOMFROMTEXT('MULTIPOINT (10 40, 40 30, 20 20, 30 10)', 4326) AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
 ) AS "t0"

ibis/backends/postgres/tests/snapshots/test_geospatial/test_literal_geospatial_inferred/shp8/out.sql

@@ -1,6 +1,6 @@
 SELECT
-  ST_ASEWKB("t0"."<MULTIPOINT ((0 0), (1 1), (2 2))>") AS "<MULTIPOINT ((0 0), (1 1), (2 2))>"
+  ST_ASEWKB("t0"."<MULTIPOINT (0 0, 1 1, 2 2)>") AS "<MULTIPOINT (0 0, 1 1, 2 2)>"
 FROM (
   SELECT
-    ST_GEOMFROMTEXT('MULTIPOINT ((0 0), (1 1), (2 2))') AS "<MULTIPOINT ((0 0), (1 1), (2 2))>"
+    ST_GEOMFROMTEXT('MULTIPOINT (0 0, 1 1, 2 2)') AS "<MULTIPOINT (0 0, 1 1, 2 2)>"
 ) AS "t0"

ibis/backends/postgres/tests/test_geospatial.py

@@ -81,13 +81,7 @@ def test_literal_geospatial_explicit(con, expr, snapshot):
         shp_polygon_0,
         shp_multipolygon_0,
         shp_multilinestring_0,
-        param(
-            shp_multipoint_0,
-            marks=pytest.mark.xfail(
-                raises=AssertionError,
-                reason="Bug-fix change in GEOS 3.12 see shapely issue #1992",
-            ),
-        ),
+        shp_multipoint_0,
     ],
 )
 def test_literal_geospatial_inferred(con, shp, snapshot):
@@ -393,15 +387,7 @@ def test_geo_dataframe(geotable):
             id="polygon_single",
         ),
         # Multipart geometries (2D)
-        param(
-            "multipoint",
-            ((10, 40), (40, 30), (20, 20), (30, 10)),
-            id="multipoint",
-            marks=pytest.mark.xfail(
-                raises=AssertionError,
-                reason="Bug-fix change in GEOS 3.12 see shapely issue #1992",
-            ),
-        ),
+        param("multipoint", ((10, 40), (40, 30), (20, 20), (30, 10)), id="multipoint"),
         param(
             "multilinestring",
             (((10, 10), (20, 20), (10, 40)), ((40, 40), (30, 30), (40, 20), (30, 10))),

ibis/backends/tests/test_aggregation.py

@@ -1594,7 +1594,7 @@ def test_group_concat_over_window(backend, con):
     backend.assert_frame_equal(result, expected)
 
 
-@pytest.mark.notimpl(["dask"], raises=NotImplementedError)
+@pytest.mark.xfail_version(dask=["dask<2024.2.0"])
 def test_value_counts_on_expr(backend, alltypes, df):
     expr = alltypes.bigint_col.add(1).value_counts()
     columns = expr.columns

ibis/backends/tests/test_generic.py

@@ -537,12 +537,12 @@ def test_select_sort_sort(alltypes):
         param(
             ["id", "int_col"],
             {"by": ["id", "int_col"]},
-            marks=pytest.mark.notimpl(["dask"]),
+            marks=pytest.mark.xfail_version(dask=["dask<2024.2.0"]),
         ),
         param(
             ["id", ibis.desc("int_col")],
             {"by": ["id", "int_col"], "ascending": [True, False]},
-            marks=pytest.mark.notimpl(["dask"]),
+            marks=pytest.mark.xfail_version(dask=["dask<2024.2.0"]),
         ),
     ],
 )
@@ -849,13 +849,13 @@ def test_typeof(con):
 @pytest.mark.notyet(["impala"], reason="can't find table in subquery")
 @pytest.mark.notimpl(["datafusion", "druid"])
 @pytest.mark.notimpl(["pyspark"], condition=is_older_than("pyspark", "3.5.0"))
-@pytest.mark.notyet(["dask"], reason="not supported by the backend")
 @pytest.mark.notyet(["exasol"], raises=ExaQueryError, reason="not supported by exasol")
 @pytest.mark.broken(
     ["risingwave"],
     raises=PsycoPg2InternalError,
     reason="https://github.com/risingwavelabs/risingwave/issues/1343",
 )
+@pytest.mark.xfail_version(dask=["dask<2024.2.0"])
 def test_isin_uncorrelated(
     backend, batting, awards_players, batting_df, awards_players_df
 ):
@@ -876,7 +876,9 @@ def test_isin_uncorrelated(
 
 @pytest.mark.broken(["polars"], reason="incorrect answer")
 @pytest.mark.notimpl(["druid"])
-@pytest.mark.notyet(["dask"], reason="not supported by the backend")
+@pytest.mark.xfail_version(
+    dask=["dask<2024.2.0"], reason="not supported by the backend"
+)
 def test_isin_uncorrelated_filter(
     backend, batting, awards_players, batting_df, awards_players_df
 ):