feat(native): Support Python 3.12 (#7550)

cube-js · Dec 18, 2023 · 618a81e · 618a81e
1 parent 7a01dcd
commit 618a81e
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 41 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -69,7 +69,7 @@ jobs:
     strategy:
       matrix:
         node-version: [16]
-        python-version: ["3.9", "3.10", "3.11", "fallback"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "fallback"]
         target: ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]
         include:
           - target: x86_64-unknown-linux-gnu
@@ -170,7 +170,7 @@ jobs:
         node-version: [16.x]
         os-version: ["macos-11"]
         target: ["x86_64-apple-darwin", "aarch64-apple-darwin"]
-        python-version: ["3.9", "3.10", "3.11", "fallback"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "fallback"]
         include:
           - target: x86_64-apple-darwin
             package_target_arch: x64
@@ -190,6 +190,8 @@ jobs:
             python-version: "3.10"
           - target: "aarch64-apple-darwin"
             python-version: "3.11"
+          - target: "aarch64-apple-darwin"
+            python-version: "3.12"
       fail-fast: false
 
     steps:

diff --git a/.github/workflows/rust-cubesql.yml b/.github/workflows/rust-cubesql.yml
@@ -130,14 +130,16 @@ jobs:
       matrix:
         # Current used version + 1 LTS
         node-version: [16, 18]
-        python-version: ["3.9", "3.10", "3.11", "fallback"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "fallback"]
         target: ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]
         # minimize number of jobs
         exclude:
           - node-version: 18
             target: "aarch64-unknown-linux-gnu"
           - python-version: 3.10
             target: "aarch64-unknown-linux-gnu"
+          - python-version: 3.11
+            target: "aarch64-unknown-linux-gnu"
       fail-fast: false
     container:
       image: cubejs/rust-cross:${{ matrix.target }}-30052023
@@ -238,6 +240,8 @@ jobs:
             python-version: "3.10"
           - target: x86_64-apple-darwin
             python-version: "3.11"
+          - target: x86_64-apple-darwin
+            python-version: "3.12"
           - target: x86_64-apple-darwin
             python-version: "fallback"
           - target: aarch64-apple-darwin

diff --git a/packages/cubejs-backend-native/Cargo.lock b/packages/cubejs-backend-native/Cargo.lock
diff --git a/packages/cubejs-backend-native/Cargo.toml b/packages/cubejs-backend-native/Cargo.toml
@@ -31,8 +31,8 @@ convert_case = "0.6.0"
 minijinja = { version = "1", features = ["json", "loader"] }
 log-reroute = "0.1"
 # python
-pyo3 = { version = "0.19", features = [], optional = true }
-pyo3-asyncio = { version = "0.19", features = ["tokio-runtime", "attributes"], optional = true }
+pyo3 = { version = "0.20.0", features = [], optional = true }
+pyo3-asyncio = { version = "0.20.0", features = ["tokio-runtime", "attributes"], optional = true }
 
 [dependencies.neon]
 version = "=0.10.1"

diff --git a/packages/cubejs-backend-native/README.md b/packages/cubejs-backend-native/README.md
@@ -21,21 +21,21 @@ If Cube cannot detect a `libpython` library or your system is not supported, it
 
 ### With python
 
-Supported python versions: `3.11`, `3.10`, `3.9`.
+Supported python versions: `3.12`, `3.11`, `3.10`, `3.9`.
 
-|          |   `linux-gnu`   |   `linux-musl`   |  `darwin`   |    `win32`    |
-| -------- |:---------------:|:----------------:|:-----------:|:-------------:|
-| `x86`    |       N/A       |       N/A        |     N/A     |      N/A      |
-| `x86_64` |        ✅       |       N/A        |     N/A     |      N/A      |
-| `arm64`  |       N/A       |       N/A        |     N/A     |      N/A      |
+|          | `linux-gnu` | `linux-musl` | `darwin` | `win32` |
+|----------|:-----------:|:------------:|:--------:|:-------:|
+| `x86`    |     N/A     |     N/A      |   N/A    |   N/A   |
+| `x86_64` |      ✅      |     N/A      |   N/A    |   N/A   |
+| `arm64`  |      ✅      |     N/A      |   N/A    |   N/A   |
 
 ### Fallback (without python)
 
-|          | `linux-gnu` | `linux-musl`  | `darwin` | `win32` |
-| -------- | :---------: |:-------------:|:--------:| :-----: |
-| `x86`    |     N/A     |      N/A      |   N/A    |   N/A   |
-| `x86_64` |     ✅      |      N/A      |    ✅     |   ✅    |
-| `arm64`  |     ✅      |      N/A      |    ✅     |         |
+|          | `linux-gnu` | `linux-musl` | `darwin` | `win32` |
+|----------|:-----------:|:------------:|:--------:|:-------:|
+| `x86`    |     N/A     |     N/A      |   N/A    |   N/A   |
+| `x86_64` |      ✅      |     N/A      |    ✅     |    ✅    |
+| `arm64`  |      ✅      |     N/A      |    ✅     |         |
 
 ### License
 

diff --git a/packages/cubejs-backend-native/package.json b/packages/cubejs-backend-native/package.json
@@ -53,6 +53,7 @@
         "value": [
           "libpython",
           [
+            "3.12",
             "3.11",
             "3.10",
             "3.9"

diff --git a/packages/cubejs-backend-native/src/cross/clrepr_python.rs b/packages/cubejs-backend-native/src/cross/clrepr_python.rs
@@ -5,7 +5,7 @@ use pyo3::types::{
     PyBool, PyComplex, PyDate, PyDict, PyFloat, PyFrame, PyFunction, PyInt, PyList, PySequence,
     PySet, PyString, PyTraceback, PyTuple,
 };
-use pyo3::{AsPyPointer, Py, PyAny, PyErr, PyObject, Python, ToPyObject};
+use pyo3::{Py, PyAny, PyErr, PyObject, Python, ToPyObject};
 
 #[derive(Debug, Clone)]
 pub enum PythonRef {

diff --git a/packages/cubejs-backend-native/src/cross/mod.rs b/packages/cubejs-backend-native/src/cross/mod.rs
@@ -8,5 +8,3 @@ pub use clrepr::{CLRepr, CLReprKind, CLReprObject, StringType};
 
 #[cfg(feature = "python")]
 pub use clrepr_python::{CLReprPython, PythonRef};
-#[cfg(feature = "python")]
-pub use py_in_js::{BoxedJsPyFunctionWrapper, JsPyFunctionWrapper};
diff --git a/packages/cubejs-backend-native/src/python/runtime.rs b/packages/cubejs-backend-native/src/python/runtime.rs
@@ -8,7 +8,6 @@ use neon::types::Deferred;
 use once_cell::sync::OnceCell;
 use pyo3::prelude::*;
 use pyo3::types::{PyFunction, PyTuple};
-use pyo3::AsPyPointer;
 use std::fmt::Formatter;
 use std::future::Future;
 use std::pin::Pin;

diff --git a/packages/cubejs-backend-native/src/python/utils.rs b/packages/cubejs-backend-native/src/python/utils.rs
@@ -2,7 +2,6 @@ use crate::cross::*;
 use pyo3::exceptions::PyNotImplementedError;
 use pyo3::prelude::*;
 use pyo3::types::{PyFunction, PyString, PyTuple};
-use pyo3::AsPyPointer;
 
 pub fn python_fn_call_sync(py_fun: &Py<PyFunction>, arguments: Vec<CLRepr>) -> PyResult<CLRepr> {
     Python::with_gil(|py| {