Merge branch 'main' into new-init-validate-name

PyO3 · Feb 24, 2024 · 9b21beb · 9b21beb
2 parents f1ef54b + b209c4b
commit 9b21beb
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 72 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -56,7 +56,7 @@ repos:
           )
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.1
+    rev: v0.2.2
     hooks:
       - id: ruff-format
       - id: ruff

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -62,7 +62,7 @@ rustc_version = "0.4.0"
 semver = "1.0.13"
 target-lexicon = "0.12.8"
 indexmap = "2.0.2"
-pyproject-toml = "0.8.1"
+pyproject-toml = "0.10.0"
 python-pkginfo = "0.6.0"
 textwrap = "0.16.0"
 ignore = "0.4.20"
@@ -72,8 +72,8 @@ cc = "1.0.72"
 dunce = "1.0.2"
 normpath = "1.0.0"
 path-slash = "0.2.1"
-pep440_rs = { version = "0.3.6", features = ["serde"] }
-pep508_rs = { version = "0.2.1", features = ["serde"] }
+pep440_rs = { version = "0.5.0", features = ["serde", "tracing"] }
+pep508_rs = { version = "0.4.2", features = ["serde", "tracing"] }
 time = "0.3.17"
 unicode-xid = "0.2.4"
 

diff --git a/src/build_context.rs b/src/build_context.rs
@@ -128,7 +128,7 @@ fn bin_wasi_helper(
     if !metadata21
         .requires_dist
         .iter()
-        .any(|requirement| requirement.name == "wasmtime")
+        .any(|requirement| requirement.name.as_ref() == "wasmtime")
     {
         // Having the wasmtime version hardcoded is not ideal, it's easy enough to overwrite
         metadata21
@@ -900,7 +900,7 @@ impl BuildContext {
             .metadata21
             .requires_dist
             .iter()
-            .any(|requirement| requirement.name == "cffi")
+            .any(|requirement| requirement.name.as_ref() == "cffi")
         {
             eprintln!(
                 "⚠️  Warning: missing cffi package dependency, please add it to pyproject.toml. \

diff --git a/src/module_writer.rs b/src/module_writer.rs
@@ -1360,7 +1360,7 @@ mod tests {
     #[test]
     // The mechanism is the same for wheel_writer
     fn sdist_writer_excludes() -> Result<(), Box<dyn std::error::Error>> {
-        let metadata = Metadata21::new("dummy".to_string(), Version::from_release(vec![1, 0]));
+        let metadata = Metadata21::new("dummy".to_string(), Version::new([1, 0]));
         let perm = 0o777;
 
         // No excludes

diff --git a/src/pyproject_toml.rs b/src/pyproject_toml.rs
@@ -318,7 +318,7 @@ impl PyProjectToml {
             .build_system
             .requires
             .iter()
-            .find(|x| x.name == maturin);
+            .find(|x| x.name.as_ref() == maturin);
         if let Some(requires_maturin) = requires_maturin {
             match requires_maturin.version_or_url.as_ref() {
                 Some(VersionOrUrl::VersionSpecifier(version_specifier)) => {

diff --git a/src/python_interpreter/mod.rs b/src/python_interpreter/mod.rs
@@ -40,7 +40,7 @@ fn windows_interpreter_no_build(
 
     // From requires-python in pyproject.toml
     if let Some(requires_python) = requires_python {
-        if !requires_python.contains(&Version::from_release(vec![major, minor])) {
+        if !requires_python.contains(&Version::new([major as u64, minor as u64])) {
             return true;
         }
     }
@@ -726,7 +726,7 @@ impl PythonInterpreter {
             .filter_map(|config| match requires_python {
                 Some(requires_python) => {
                     if requires_python
-                        .contains(&Version::from_release(vec![config.major, config.minor]))
+                        .contains(&Version::new([config.major as u64, config.minor as u64]))
                     {
                         Some(Self::from_config(config))
                     } else {
@@ -760,7 +760,7 @@ impl PythonInterpreter {
                 .filter(|minor| {
                     requires_python
                         .map(|requires_python| {
-                            requires_python.contains(&Version::from_release(vec![3, *minor]))
+                            requires_python.contains(&Version::new([3, *minor as u64]))
                         })
                         .unwrap_or(true)
                 })
@@ -776,8 +776,7 @@ impl PythonInterpreter {
                         .filter(|minor| {
                             requires_python
                                 .map(|requires_python| {
-                                    requires_python
-                                        .contains(&Version::from_release(vec![3, *minor]))
+                                    requires_python.contains(&Version::new([3, *minor as u64]))
                                 })
                                 .unwrap_or(true)
                         })

diff --git a/test-crates/pyo3-no-extension-module/Cargo.lock b/test-crates/pyo3-no-extension-module/Cargo.lock