Bump to latest arrow, pyo3-arrow (#122)

* Bump to latest pyo3-arrow

* add uv sync

Author: kylebarron

.github/workflows/test.yml

@@ -55,12 +55,16 @@ jobs:
         uses: astral-sh/setup-uv@v3
         with:
           enable-cache: true
-          version: "0.4.x"
+          version: "0.5.x"
+
+      - name: uv sync
+        working-directory: python
+        run: uv sync --no-install-package geoindex-rs
 
       - name: maturin venv Build
         working-directory: python
-        run: uv run maturin develop
+        run: uv run --no-project maturin develop
 
       - name: Run pytest
         working-directory: python
-        run: uv run pytest
+        run: uv run --no-project pytest

python/Cargo.lock

@@ -17,17 +17,17 @@ name = "_rust"
 crate-type = ["cdylib"]
 
 [dependencies]
-arrow-array = "53.0.0"
-arrow-buffer = "53.0.0"
-arrow-cast = "53.0.0"
-arrow-schema = "53.0.0"
+arrow-array = "54.0.0"
+arrow-buffer = "54.0.0"
+arrow-cast = "54.0.0"
+arrow-schema = "54.0.0"
 bytemuck = "1.21.0"
 bytes = "1.8"
 geo-index = { path = "../", features = ["rayon"] }
 numpy = "0.23"
-pyo3 = { version = "0.23.0", features = ["macros"] }
+pyo3 = { version = "0.23.4", features = ["macros"] }
 thiserror = "1"
-pyo3-arrow = "0.6.0"
+pyo3-arrow = "0.7.0"
 
 [profile.release]
 lto = true

python/Cargo.toml

@@ -74,7 +74,7 @@ impl PyKDTreeBuilder {
         }
         let mut out_array = UInt32Builder::with_capacity(x_array.len());
 
-        let inner = self.0.as_mut().take().unwrap();
+        let inner = self.0.as_mut().unwrap();
 
         match (x_field.data_type(), y) {
             (DataType::FixedSizeList(_inner_field, list_size), y) => {
@@ -172,7 +172,9 @@ impl PyKDTreeBuilder {
             _ => return Err(PyValueError::new_err("Unsupported argument types")),
         };
 
-        PyArray::from_array_ref(Arc::new(out_array.finish())).to_arro3(py)
+        Ok(PyArray::from_array_ref(Arc::new(out_array.finish()))
+            .to_arro3(py)?
+            .unbind())
     }
 
     fn finish(&mut self) -> PyResult<PyKDTree> {

python/src/kdtree/builder.rs

@@ -32,5 +32,7 @@ pub fn range(
         ),
     };
     let results = UInt32Array::new(ScalarBuffer::from(results), None);
-    PyArray::from_array_ref(Arc::new(results)).to_arro3(py)
+    Ok(PyArray::from_array_ref(Arc::new(results))
+        .to_arro3(py)?
+        .unbind())
 }

python/src/kdtree/range.rs

@@ -21,5 +21,7 @@ pub fn within(
         PyKDTreeRef::Float64(tree) => tree.within(qx.extract()?, qy.extract()?, r.extract()?),
     };
     let results = UInt32Array::new(ScalarBuffer::from(results), None);
-    PyArray::from_array_ref(Arc::new(results)).to_arro3(py)
+    Ok(PyArray::from_array_ref(Arc::new(results))
+        .to_arro3(py)?
+        .unbind())
 }

python/src/kdtree/within.rs

@@ -29,5 +29,5 @@ pub fn boxes_at_level(
             boxes_to_arrow::<Float64Type>(boxes, tree.buffer().clone(), copy)
         }
     };
-    PyArray::from_array_ref(array).to_arro3(py)
+    Ok(PyArray::from_array_ref(array).to_arro3(py)?.unbind())
 }