chore: bump py-o3 (#924)

conda · Nov 4, 2024 · 587d0a2 · 587d0a2
1 parent 84abcda
commit 587d0a2
Show file tree

Hide file tree

Showing 18 changed files with 234 additions and 232 deletions.
diff --git a/py-rattler/Cargo.lock b/py-rattler/Cargo.lock
diff --git a/py-rattler/Cargo.toml b/py-rattler/Cargo.toml
@@ -10,7 +10,7 @@ name = "rattler"
 crate-type = ["cdylib"]
 
 [features]
-default = ["native-tls"]
+default = ["rustls-tls"]
 native-tls = ["rattler_networking/native-tls", "rattler_repodata_gateway/native-tls"]
 rustls-tls = ["rattler_networking/rustls-tls", "rattler_repodata_gateway/rustls-tls"]
 vendored-openssl = ["openssl", "openssl/vendored"]
@@ -36,13 +36,14 @@ rattler_solve = { path = "../crates/rattler_solve", default-features = false, fe
 rattler_index = { path = "../crates/rattler_index" }
 rattler_lock = { path = "../crates/rattler_lock", default-features = false }
 rattler_package_streaming = { path = "../crates/rattler_package_streaming", default-features = false }
-pyo3 = { version = "0.20", features = [
+pyo3 = { version = "0.22.5", features = [
     "abi3-py38",
     "extension-module",
     "multiple-pymethods",
-    "chrono"
+    "chrono",
+    "gil-refs"
 ] }
-pyo3-asyncio = { version = "0.20", features = ["tokio-runtime"] }
+pyo3-async-runtimes = { version = "0.22.0", features = ["tokio-runtime"] }
 tokio = { version = "1.37" }
 
 reqwest = { version = "0.12.3", default-features = false }
@@ -56,7 +57,7 @@ pep508_rs = "0.9.1"
 serde_json = "1.0.132"
 
 [build-dependencies]
-pyo3-build-config = "0.21"
+pyo3-build-config = "0.22.5"
 
 
 [patch.crates-io]

diff --git a/py-rattler/src/channel/mod.rs b/py-rattler/src/channel/mod.rs
@@ -83,8 +83,8 @@ impl PyChannel {
     }
 }
 
-#[pyclass]
-#[derive(Clone)]
+#[pyclass(eq, eq_int)]
+#[derive(Clone, PartialEq, Eq)]
 pub enum PyChannelPriority {
     /// The channel that the package is first found in will be used as the only channel
     /// for that package.

diff --git a/py-rattler/src/index.rs b/py-rattler/src/index.rs
@@ -7,6 +7,7 @@ use std::path::PathBuf;
 use crate::{error::PyRattlerError, platform::PyPlatform};
 
 #[pyfunction]
+#[pyo3(signature = (channel_directory, target_platform=None))]
 pub fn py_index(
     py: Python<'_>,
     channel_directory: PathBuf,

diff --git a/py-rattler/src/installer.rs b/py-rattler/src/installer.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
-use pyo3::{pyfunction, PyAny, PyResult, Python};
-use pyo3_asyncio::tokio::future_into_py;
+use pyo3::{pyfunction, Bound, PyAny, PyResult, Python};
+use pyo3_async_runtimes::tokio::future_into_py;
 use rattler::{
     install::{IndicatifReporter, Installer},
     package_cache::PackageCache,
@@ -16,17 +16,18 @@ use crate::{
 // TODO: Accept functions to report progress
 #[pyfunction]
 #[allow(clippy::too_many_arguments)]
+#[pyo3(signature = (records, target_prefix, execute_link_scripts=false, show_progress=false, platform=None, client=None, cache_dir=None, installed_packages=None))]
 pub fn py_install<'a>(
     py: Python<'a>,
-    records: Vec<&'a PyAny>,
+    records: Vec<Bound<'a, PyAny>>,
     target_prefix: PathBuf,
     execute_link_scripts: bool,
     show_progress: bool,
     platform: Option<PyPlatform>,
     client: Option<PyClientWithMiddleware>,
     cache_dir: Option<PathBuf>,
-    installed_packages: Option<Vec<&'a PyAny>>,
-) -> PyResult<&'a PyAny> {
+    installed_packages: Option<Vec<Bound<'a, PyAny>>>,
+) -> PyResult<Bound<'a, PyAny>> {
     let dependencies = records
         .into_iter()
         .map(|rdr| PyRecord::try_from(rdr)?.try_into())