From 0929115e6455ed06c0e9db498cbe33ae85d5c37c Mon Sep 17 00:00:00 2001
From: Lawrence Mitchell <lmitchell@nvidia.com>
Date: Thu, 31 Oct 2024 21:52:59 +0000
Subject: [PATCH] Support for polars 1.12 in cudf-polars (#17227)

No new updates are required, we must just no longer xfail a test if running with 1.12

Authors:
  - Lawrence Mitchell (https://github.com/wence-)
  - Matthew Murray (https://github.com/Matt711)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: https://github.com/rapidsai/cudf/pull/17227
---
 conda/environments/all_cuda-118_arch-x86_64.yaml           | 2 +-
 conda/environments/all_cuda-125_arch-x86_64.yaml           | 2 +-
 dependencies.yaml                                          | 2 +-
 python/cudf_polars/cudf_polars/containers/dataframe.py     | 3 ++-
 .../cudf_polars/cudf_polars/dsl/expressions/aggregation.py | 1 +
 python/cudf_polars/cudf_polars/dsl/expressions/binaryop.py | 4 ++--
 python/cudf_polars/cudf_polars/dsl/expressions/boolean.py  | 3 ++-
 python/cudf_polars/cudf_polars/dsl/expressions/datetime.py | 3 ++-
 python/cudf_polars/cudf_polars/dsl/expressions/literal.py  | 1 +
 .../cudf_polars/cudf_polars/dsl/expressions/selection.py   | 1 +
 python/cudf_polars/cudf_polars/dsl/expressions/string.py   | 3 ++-
 python/cudf_polars/cudf_polars/dsl/expressions/unary.py    | 1 +
 python/cudf_polars/cudf_polars/dsl/ir.py                   | 3 ++-
 python/cudf_polars/cudf_polars/dsl/to_ast.py               | 4 ++--
 python/cudf_polars/cudf_polars/dsl/translate.py            | 3 ++-
 python/cudf_polars/cudf_polars/typing/__init__.py          | 4 ++--
 python/cudf_polars/cudf_polars/utils/dtypes.py             | 3 ++-
 python/cudf_polars/cudf_polars/utils/versions.py           | 7 ++++---
 python/cudf_polars/pyproject.toml                          | 4 ++--
 python/cudf_polars/tests/containers/test_column.py         | 3 ++-
 python/cudf_polars/tests/containers/test_dataframe.py      | 3 ++-
 python/cudf_polars/tests/dsl/test_expr.py                  | 3 ++-
 python/cudf_polars/tests/dsl/test_to_ast.py                | 3 ++-
 python/cudf_polars/tests/dsl/test_traversal.py             | 4 ++--
 python/cudf_polars/tests/expressions/test_literal.py       | 3 ++-
 python/cudf_polars/tests/expressions/test_sort.py          | 3 ++-
 python/cudf_polars/tests/test_join.py                      | 3 ++-
 python/cudf_polars/tests/utils/test_broadcast.py           | 3 ++-
 28 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 24dc3c9a7cc..9d9fec97731 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -66,7 +66,7 @@ dependencies:
 - pandas
 - pandas>=2.0,<2.2.4dev0
 - pandoc
-- polars>=1.11,<1.12
+- polars>=1.11,<1.13
 - pre-commit
 - ptxcompiler
 - pyarrow>=14.0.0,<18.0.0a0
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
index a2bb2a3fe7f..19e3eafd641 100644
--- a/conda/environments/all_cuda-125_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -64,7 +64,7 @@ dependencies:
 - pandas
 - pandas>=2.0,<2.2.4dev0
 - pandoc
-- polars>=1.11,<1.12
+- polars>=1.11,<1.13
 - pre-commit
 - pyarrow>=14.0.0,<18.0.0a0
 - pydata-sphinx-theme!=0.14.2
diff --git a/dependencies.yaml b/dependencies.yaml
index 12038c5e503..90255ca674c 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -727,7 +727,7 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
-          - polars>=1.11,<1.12
+          - polars>=1.11,<1.13
   run_dask_cudf:
     common:
       - output_types: [conda, requirements, pyproject]
diff --git a/python/cudf_polars/cudf_polars/containers/dataframe.py b/python/cudf_polars/cudf_polars/containers/dataframe.py
index 2c195f6637c..08bc9d0ea3f 100644
--- a/python/cudf_polars/cudf_polars/containers/dataframe.py
+++ b/python/cudf_polars/cudf_polars/containers/dataframe.py
@@ -9,10 +9,11 @@
 from typing import TYPE_CHECKING, cast
 
 import pyarrow as pa
-import pylibcudf as plc
 
 import polars as pl
 
+import pylibcudf as plc
+
 from cudf_polars.containers import Column
 from cudf_polars.utils import dtypes
 
diff --git a/python/cudf_polars/cudf_polars/dsl/expressions/aggregation.py b/python/cudf_polars/cudf_polars/dsl/expressions/aggregation.py
index 41b1defab39..2af9fdaacc5 100644
--- a/python/cudf_polars/cudf_polars/dsl/expressions/aggregation.py
+++ b/python/cudf_polars/cudf_polars/dsl/expressions/aggregation.py
@@ -10,6 +10,7 @@
 from typing import TYPE_CHECKING, Any, ClassVar
 
 import pyarrow as pa
+
 import pylibcudf as plc
 
 from cudf_polars.containers import Column
diff --git a/python/cudf_polars/cudf_polars/dsl/expressions/binaryop.py b/python/cudf_polars/cudf_polars/dsl/expressions/binaryop.py
index 11a47e7ea51..245bdbefe88 100644
--- a/python/cudf_polars/cudf_polars/dsl/expressions/binaryop.py
+++ b/python/cudf_polars/cudf_polars/dsl/expressions/binaryop.py
@@ -8,10 +8,10 @@
 
 from typing import TYPE_CHECKING, ClassVar
 
-import pylibcudf as plc
-
 from polars.polars import _expr_nodes as pl_expr
 
+import pylibcudf as plc
+
 from cudf_polars.containers import Column
 from cudf_polars.dsl.expressions.base import AggInfo, ExecutionContext, Expr
 
diff --git a/python/cudf_polars/cudf_polars/dsl/expressions/boolean.py b/python/cudf_polars/cudf_polars/dsl/expressions/boolean.py
index 9c14a8386f3..8db8172ebd1 100644
--- a/python/cudf_polars/cudf_polars/dsl/expressions/boolean.py
+++ b/python/cudf_polars/cudf_polars/dsl/expressions/boolean.py
@@ -10,10 +10,11 @@
 from typing import TYPE_CHECKING, Any, ClassVar
 
 import pyarrow as pa
-import pylibcudf as plc
 
 from polars.polars import _expr_nodes as pl_expr
 
+import pylibcudf as plc
+
 from cudf_polars.containers import Column
 from cudf_polars.dsl.expressions.base import (
     ExecutionContext,
diff --git a/python/cudf_polars/cudf_polars/dsl/expressions/datetime.py b/python/cudf_polars/cudf_polars/dsl/expressions/datetime.py
index 596e193d8fe..65fa4bfa62f 100644
--- a/python/cudf_polars/cudf_polars/dsl/expressions/datetime.py
+++ b/python/cudf_polars/cudf_polars/dsl/expressions/datetime.py
@@ -9,10 +9,11 @@
 from typing import TYPE_CHECKING, Any, ClassVar
 
 import pyarrow as pa
-import pylibcudf as plc
 
 from polars.polars import _expr_nodes as pl_expr
 
+import pylibcudf as plc
+
 from cudf_polars.containers import Column
 from cudf_polars.dsl.expressions.base import ExecutionContext, Expr
 
diff --git a/python/cudf_polars/cudf_polars/dsl/expressions/literal.py b/python/cudf_polars/cudf_polars/dsl/expressions/literal.py
index c8aa993b994..c16313bf83c 100644
--- a/python/cudf_polars/cudf_polars/dsl/expressions/literal.py
+++ b/python/cudf_polars/cudf_polars/dsl/expressions/literal.py
@@ -9,6 +9,7 @@
 from typing import TYPE_CHECKING, Any
 
 import pyarrow as pa
+
 import pylibcudf as plc
 
 from cudf_polars.containers import Column
diff --git a/python/cudf_polars/cudf_polars/dsl/expressions/selection.py b/python/cudf_polars/cudf_polars/dsl/expressions/selection.py
index 0247256e507..77d7d4c0d22 100644
--- a/python/cudf_polars/cudf_polars/dsl/expressions/selection.py
+++ b/python/cudf_polars/cudf_polars/dsl/expressions/selection.py
@@ -9,6 +9,7 @@
 from typing import TYPE_CHECKING
 
 import pyarrow as pa
+
 import pylibcudf as plc
 
 from cudf_polars.containers import Column
diff --git a/python/cudf_polars/cudf_polars/dsl/expressions/string.py b/python/cudf_polars/cudf_polars/dsl/expressions/string.py
index 62b54c63a8d..8b66c9d4676 100644
--- a/python/cudf_polars/cudf_polars/dsl/expressions/string.py
+++ b/python/cudf_polars/cudf_polars/dsl/expressions/string.py
@@ -10,11 +10,12 @@
 
 import pyarrow as pa
 import pyarrow.compute as pc
-import pylibcudf as plc
 
 from polars.exceptions import InvalidOperationError
 from polars.polars import _expr_nodes as pl_expr
 
+import pylibcudf as plc
+
 from cudf_polars.containers import Column
 from cudf_polars.dsl.expressions.base import ExecutionContext, Expr
 from cudf_polars.dsl.expressions.literal import Literal, LiteralColumn
diff --git a/python/cudf_polars/cudf_polars/dsl/expressions/unary.py b/python/cudf_polars/cudf_polars/dsl/expressions/unary.py
index 53f6ed29239..6f22544c050 100644
--- a/python/cudf_polars/cudf_polars/dsl/expressions/unary.py
+++ b/python/cudf_polars/cudf_polars/dsl/expressions/unary.py
@@ -8,6 +8,7 @@
 from typing import TYPE_CHECKING, Any, ClassVar
 
 import pyarrow as pa
+
 import pylibcudf as plc
 
 from cudf_polars.containers import Column
diff --git a/python/cudf_polars/cudf_polars/dsl/ir.py b/python/cudf_polars/cudf_polars/dsl/ir.py
index 1aa6741d417..04aa74024cd 100644
--- a/python/cudf_polars/cudf_polars/dsl/ir.py
+++ b/python/cudf_polars/cudf_polars/dsl/ir.py
@@ -20,11 +20,12 @@
 from typing import TYPE_CHECKING, Any, ClassVar
 
 import pyarrow as pa
-import pylibcudf as plc
 from typing_extensions import assert_never
 
 import polars as pl
 
+import pylibcudf as plc
+
 import cudf_polars.dsl.expr as expr
 from cudf_polars.containers import Column, DataFrame
 from cudf_polars.dsl.nodebase import Node
diff --git a/python/cudf_polars/cudf_polars/dsl/to_ast.py b/python/cudf_polars/cudf_polars/dsl/to_ast.py
index ffdae81de55..9a0838631cc 100644
--- a/python/cudf_polars/cudf_polars/dsl/to_ast.py
+++ b/python/cudf_polars/cudf_polars/dsl/to_ast.py
@@ -8,11 +8,11 @@
 from functools import partial, reduce, singledispatch
 from typing import TYPE_CHECKING, TypeAlias
 
+from polars.polars import _expr_nodes as pl_expr
+
 import pylibcudf as plc
 from pylibcudf import expressions as plc_expr
 
-from polars.polars import _expr_nodes as pl_expr
-
 from cudf_polars.dsl import expr
 from cudf_polars.dsl.traversal import CachingVisitor
 from cudf_polars.typing import GenericTransformer
diff --git a/python/cudf_polars/cudf_polars/dsl/translate.py b/python/cudf_polars/cudf_polars/dsl/translate.py
index c28f2c2651a..5181214819e 100644
--- a/python/cudf_polars/cudf_polars/dsl/translate.py
+++ b/python/cudf_polars/cudf_polars/dsl/translate.py
@@ -12,13 +12,14 @@
 from typing import TYPE_CHECKING, Any
 
 import pyarrow as pa
-import pylibcudf as plc
 from typing_extensions import assert_never
 
 import polars as pl
 import polars.polars as plrs
 from polars.polars import _expr_nodes as pl_expr, _ir_nodes as pl_ir
 
+import pylibcudf as plc
+
 from cudf_polars.dsl import expr, ir
 from cudf_polars.dsl.traversal import make_recursive, reuse_if_unchanged
 from cudf_polars.typing import NodeTraverser
diff --git a/python/cudf_polars/cudf_polars/typing/__init__.py b/python/cudf_polars/cudf_polars/typing/__init__.py
index a27a3395c35..57c5fdaa7cf 100644
--- a/python/cudf_polars/cudf_polars/typing/__init__.py
+++ b/python/cudf_polars/cudf_polars/typing/__init__.py
@@ -8,10 +8,10 @@
 from collections.abc import Hashable, Mapping
 from typing import TYPE_CHECKING, Any, Literal, Protocol, TypeVar, Union
 
-import pylibcudf as plc
-
 from polars.polars import _expr_nodes as pl_expr, _ir_nodes as pl_ir
 
+import pylibcudf as plc
+
 if TYPE_CHECKING:
     from collections.abc import Callable
     from typing import TypeAlias
diff --git a/python/cudf_polars/cudf_polars/utils/dtypes.py b/python/cudf_polars/cudf_polars/utils/dtypes.py
index 4154a404e98..1d0479802ca 100644
--- a/python/cudf_polars/cudf_polars/utils/dtypes.py
+++ b/python/cudf_polars/cudf_polars/utils/dtypes.py
@@ -8,11 +8,12 @@
 from functools import cache
 
 import pyarrow as pa
-import pylibcudf as plc
 from typing_extensions import assert_never
 
 import polars as pl
 
+import pylibcudf as plc
+
 __all__ = ["from_polars", "downcast_arrow_lists", "can_cast"]
 
 
diff --git a/python/cudf_polars/cudf_polars/utils/versions.py b/python/cudf_polars/cudf_polars/utils/versions.py
index 4a7ad6b3cf2..a119cab3b74 100644
--- a/python/cudf_polars/cudf_polars/utils/versions.py
+++ b/python/cudf_polars/cudf_polars/utils/versions.py
@@ -12,11 +12,12 @@
 
 POLARS_VERSION = parse(__version__)
 
-POLARS_VERSION_LT_18 = POLARS_VERSION < parse("1.8")
+POLARS_VERSION_LT_111 = POLARS_VERSION < parse("1.11")
+POLARS_VERSION_LT_112 = POLARS_VERSION < parse("1.12")
 
 
 def _ensure_polars_version():
-    if POLARS_VERSION_LT_18:
+    if POLARS_VERSION_LT_111:
         raise ImportError(
-            "cudf_polars requires py-polars v1.8 or greater."
+            "cudf_polars requires py-polars v1.11 or greater."
         )  # pragma: no cover
diff --git a/python/cudf_polars/pyproject.toml b/python/cudf_polars/pyproject.toml
index 2afdab1be4b..a2c62ef9460 100644
--- a/python/cudf_polars/pyproject.toml
+++ b/python/cudf_polars/pyproject.toml
@@ -19,7 +19,7 @@ authors = [
 license = { text = "Apache 2.0" }
 requires-python = ">=3.10"
 dependencies = [
-    "polars>=1.11,<1.12",
+    "polars>=1.11,<1.13",
     "pylibcudf==24.12.*,>=0.0.0a0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
@@ -188,7 +188,7 @@ required-imports = ["from __future__ import annotations"]
 
 [tool.ruff.lint.isort.sections]
 polars = ["polars"]
-rapids = ["rmm", "cudf"]
+rapids = ["rmm", "pylibcudf"]
 
 [tool.ruff.format]
 docstring-code-format = true
diff --git a/python/cudf_polars/tests/containers/test_column.py b/python/cudf_polars/tests/containers/test_column.py
index 1f26ab1af9f..95541b4ecc3 100644
--- a/python/cudf_polars/tests/containers/test_column.py
+++ b/python/cudf_polars/tests/containers/test_column.py
@@ -4,9 +4,10 @@
 from __future__ import annotations
 
 import pyarrow
-import pylibcudf as plc
 import pytest
 
+import pylibcudf as plc
+
 from cudf_polars.containers import Column
 
 
diff --git a/python/cudf_polars/tests/containers/test_dataframe.py b/python/cudf_polars/tests/containers/test_dataframe.py
index 5c68fb8f0aa..d68c8d90163 100644
--- a/python/cudf_polars/tests/containers/test_dataframe.py
+++ b/python/cudf_polars/tests/containers/test_dataframe.py
@@ -3,11 +3,12 @@
 
 from __future__ import annotations
 
-import pylibcudf as plc
 import pytest
 
 import polars as pl
 
+import pylibcudf as plc
+
 from cudf_polars.containers import Column, DataFrame
 from cudf_polars.testing.asserts import assert_gpu_result_equal
 
diff --git a/python/cudf_polars/tests/dsl/test_expr.py b/python/cudf_polars/tests/dsl/test_expr.py
index 84e33262869..de8fec301fe 100644
--- a/python/cudf_polars/tests/dsl/test_expr.py
+++ b/python/cudf_polars/tests/dsl/test_expr.py
@@ -3,9 +3,10 @@
 
 from __future__ import annotations
 
-import pylibcudf as plc
 import pytest
 
+import pylibcudf as plc
+
 from cudf_polars.dsl import expr
 
 
diff --git a/python/cudf_polars/tests/dsl/test_to_ast.py b/python/cudf_polars/tests/dsl/test_to_ast.py
index a7b779a6ec9..57d794d4890 100644
--- a/python/cudf_polars/tests/dsl/test_to_ast.py
+++ b/python/cudf_polars/tests/dsl/test_to_ast.py
@@ -3,12 +3,13 @@
 
 from __future__ import annotations
 
-import pylibcudf as plc
 import pytest
 
 import polars as pl
 from polars.testing import assert_frame_equal
 
+import pylibcudf as plc
+
 import cudf_polars.dsl.ir as ir_nodes
 from cudf_polars import translate_ir
 from cudf_polars.containers.dataframe import DataFrame, NamedColumn
diff --git a/python/cudf_polars/tests/dsl/test_traversal.py b/python/cudf_polars/tests/dsl/test_traversal.py
index 6505a786855..15c644d7978 100644
--- a/python/cudf_polars/tests/dsl/test_traversal.py
+++ b/python/cudf_polars/tests/dsl/test_traversal.py
@@ -5,11 +5,11 @@
 
 from functools import singledispatch
 
-import pylibcudf as plc
-
 import polars as pl
 from polars.testing import assert_frame_equal
 
+import pylibcudf as plc
+
 from cudf_polars import translate_ir
 from cudf_polars.dsl import expr, ir
 from cudf_polars.dsl.traversal import (
diff --git a/python/cudf_polars/tests/expressions/test_literal.py b/python/cudf_polars/tests/expressions/test_literal.py
index ced49bdc254..52bc4a9ac71 100644
--- a/python/cudf_polars/tests/expressions/test_literal.py
+++ b/python/cudf_polars/tests/expressions/test_literal.py
@@ -2,11 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 from __future__ import annotations
 
-import pylibcudf as plc
 import pytest
 
 import polars as pl
 
+import pylibcudf as plc
+
 from cudf_polars.testing.asserts import (
     assert_gpu_result_equal,
     assert_ir_translation_raises,
diff --git a/python/cudf_polars/tests/expressions/test_sort.py b/python/cudf_polars/tests/expressions/test_sort.py
index 2a37683478b..62df8ce1498 100644
--- a/python/cudf_polars/tests/expressions/test_sort.py
+++ b/python/cudf_polars/tests/expressions/test_sort.py
@@ -4,11 +4,12 @@
 
 import itertools
 
-import pylibcudf as plc
 import pytest
 
 import polars as pl
 
+import pylibcudf as plc
+
 from cudf_polars import translate_ir
 from cudf_polars.testing.asserts import assert_gpu_result_equal
 
diff --git a/python/cudf_polars/tests/test_join.py b/python/cudf_polars/tests/test_join.py
index 501560d15b8..8ca7a7b9264 100644
--- a/python/cudf_polars/tests/test_join.py
+++ b/python/cudf_polars/tests/test_join.py
@@ -13,6 +13,7 @@
     assert_gpu_result_equal,
     assert_ir_translation_raises,
 )
+from cudf_polars.utils.versions import POLARS_VERSION_LT_112
 
 
 @pytest.fixture(params=[False, True], ids=["nulls_not_equal", "nulls_equal"])
@@ -88,7 +89,7 @@ def test_left_join_with_slice(left, right, join_nulls, zlice):
     if zlice is not None:
         q_expect = q.collect().slice(*zlice)
         q = q.slice(*zlice)
-        if zlice == (1, 5) or zlice == (0, 2):
+        if POLARS_VERSION_LT_112 and (zlice == (1, 5) or zlice == (0, 2)):
             # https://github.com/pola-rs/polars/issues/19403
             # https://github.com/pola-rs/polars/issues/19405
             ctx = pytest.raises(AssertionError)
diff --git a/python/cudf_polars/tests/utils/test_broadcast.py b/python/cudf_polars/tests/utils/test_broadcast.py
index e7770bfadac..3b3b4f0f8db 100644
--- a/python/cudf_polars/tests/utils/test_broadcast.py
+++ b/python/cudf_polars/tests/utils/test_broadcast.py
@@ -3,9 +3,10 @@
 
 from __future__ import annotations
 
-import pylibcudf as plc
 import pytest
 
+import pylibcudf as plc
+
 from cudf_polars.containers import Column
 from cudf_polars.dsl.ir import broadcast