maturin 1.8.7__tar.gz → 1.9.0__tar.gz

{maturin-1.8.7 → maturin-1.9.0}/.gitignore

@@ -1,20 +1,18 @@
-target/
-venv*/
-.venv/
-.pytest_cache/
-.tox/
+*.egg
+*.egg-info/
 *.o
-*.so
 *.py[cdo]
+*.so
+.pytest_cache/
+.tox/
+.venv/
+/target/
+/test-crates/*/target
 __pycache__/
-*.egg-info/
-*.egg
 dist/
-build
-dist
+node_modules
 tags
-test-crates/wheels/
 test-crates/targets/
 test-crates/venvs/
-node_modules
-.idea
+test-crates/wheels/
+venv*/

{maturin-1.8.7 → maturin-1.9.0}/.pre-commit-config.yaml

@@ -56,7 +56,7 @@ repos:
           )
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.12
+    rev: v0.11.13
     hooks:
       - id: ruff-format
       - id: ruff

{maturin-1.8.7 → maturin-1.9.0}/Cargo.lock

@@ -976,9 +976,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "globset"
-version = "0.4.15"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
+checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -1230,6 +1230,17 @@ version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
+[[package]]
+name = "insta"
+version = "1.43.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371"
+dependencies = [
+ "console",
+ "once_cell",
+ "similar",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.0"
@@ -1425,7 +1436,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.8.7"
+version = "1.9.0"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -1454,6 +1465,7 @@ dependencies = [
  "ignore",
  "indexmap",
  "indoc",
+ "insta",
  "itertools 0.12.1",
  "keyring",
  "lddtree",
@@ -1485,7 +1497,7 @@ dependencies = [
  "target-lexicon",
  "tempfile",
  "textwrap",
- "thiserror 2.0.3",
+ "thiserror 2.0.12",
  "time",
  "toml",
  "toml_edit 0.22.22",
@@ -1820,9 +1832,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "platform-info"
-version = "2.0.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217"
+checksum = "7539aeb3fdd8cb4f6a331307cf71a1039cee75e94e8a71725b9484f4a0d9451a"
 dependencies = [
  "libc",
  "winapi",
@@ -1885,15 +1897,16 @@ dependencies = [
 
 [[package]]
 name = "pyproject-toml"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643af57c3f36ba90a8b53e972727d8092f7408a9ebfbaf4c3d2c17b07c58d835"
+checksum = "7b0f6160dc48298b9260d9b958ad1d7f96f6cd0b9df200b22329204e09334663"
 dependencies = [
+ "glob",
  "indexmap",
  "pep440_rs",
  "pep508_rs",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "toml",
 ]
 
@@ -1908,7 +1921,7 @@ dependencies = [
  "mailparse",
  "rfc2047-decoder",
  "tar",
- "thiserror 2.0.3",
+ "thiserror 2.0.12",
  "zip",
 ]
 
@@ -2073,7 +2086,7 @@ dependencies = [
  "chumsky",
  "memchr",
  "quoted_printable",
- "thiserror 2.0.3",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -2597,11 +2610,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.3"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -2617,9 +2630,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3494,7 +3507,7 @@ dependencies = [
  "indexmap",
  "lzma-rs",
  "memchr",
- "thiserror 2.0.3",
+ "thiserror 2.0.12",
  "time",
  "zopfli",
  "zstd",

{maturin-1.8.7 → maturin-1.9.0}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
 name = "maturin"
-version = "1.8.7"
+version = "1.9.0"
 description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",
@@ -72,7 +72,7 @@ rustc_version = "0.4.0"
 semver = "1.0.22"
 target-lexicon = "0.13.0"
 indexmap = "2.2.3"
-pyproject-toml = "0.13.4"
+pyproject-toml = { version = "0.13.5", features = ["pep639-glob"] }
 python-pkginfo = "0.6.5"
 textwrap = "0.16.1"
 ignore = "0.4.20"
@@ -143,6 +143,7 @@ pretty_assertions = { version = "1.3.0", optional = true }
 expect-test = "1.4.1"
 fs4 = { version = "0.12.0", features = ["fs-err3"] }
 indoc = "2.0.3"
+insta = "1.34.0"
 pretty_assertions = "1.3.0"
 rstest = "0.22.0"
 rustversion = "1.0.9"

{maturin-1.8.7 → maturin-1.9.0}/Changelog.md

@@ -1,9 +1,16 @@
 # Changelog
 
+## Unreleased
+
+## [1.9.0]
+
+* Add full PEP 639 support for `project.license` and `project.license-files` in [#2647](https://github.com/PyO3/maturin/pull/2647).
+* Add `--compatiblity pypi` to only build wheels with platform tags that can also be uploaded to PyPI. This blocks e.g. building for riscv64, which is supported by manylinux, but not by PyPI.
+
 ## [1.8.7]
 
-- Allow specifying compression method and level, in both `build` and `develop` modes, in [#2625](https://github.com/PyO3/maturin/pull/2625).
-- Fix Windows free-threaded builds on Python 3.14 in [#2632](https://github.com/PyO3/maturin/pull/2632)
+* Allow specifying compression method and level, in both `build` and `develop` modes, in [#2625](https://github.com/PyO3/maturin/pull/2625).
+* Fix Windows free-threaded builds on Python 3.14 in [#2632](https://github.com/PyO3/maturin/pull/2632)
 
 ## [1.8.6]
 
@@ -1074,7 +1081,8 @@ points-0.1.0-py2.py3-none-manylinux1_x86_64.whl | 2,8M | 752K | 85K
 
  * Initial Release
 
-[Unreleased]: https://github.com/pyo3/maturin/compare/v1.8.7...HEAD
+[Unreleased]: https://github.com/pyo3/maturin/compare/v1.9.0...HEAD
+[1.9.0]: https://github.com/pyo3/maturin/compare/v1.8.7...v1.9.0
 [1.8.7]: https://github.com/pyo3/maturin/compare/v1.8.6...v1.8.7
 [1.8.6]: https://github.com/pyo3/maturin/compare/v1.8.5...v1.8.6
 [1.8.5]: https://github.com/pyo3/maturin/compare/v1.8.4...v1.8.5

{maturin-1.8.7 → maturin-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maturin
-Version: 1.8.7
+Version: 1.9.0
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython

{maturin-1.8.7 → maturin-1.9.0}/maturin/__init__.py

@@ -21,13 +21,13 @@ import sys
 from subprocess import SubprocessError
 from typing import Any, Dict, Mapping, List, Optional
 
-try:
-    import tomllib
-except ModuleNotFoundError:
-    import tomli as tomllib  # type: ignore
-
 
 def get_config() -> Dict[str, str]:
+    try:
+        import tomllib
+    except ModuleNotFoundError:
+        import tomli as tomllib  # type: ignore
+
     with open("pyproject.toml", "rb") as fp:
         pyproject_toml = tomllib.load(fp)
     return pyproject_toml.get("tool", {}).get("maturin", {})

{maturin-1.8.7 → maturin-1.9.0}/maturin/bootstrap.py

@@ -17,23 +17,15 @@ from typing import Any
 
 # noinspection PyUnresolvedReferences
 from setuptools.build_meta import *  # noqa:F403
-from setuptools.build_meta import (
-    get_requires_for_build_sdist as _orig_get_requires_for_build_sdist,
-)
-from setuptools.build_meta import (
-    get_requires_for_build_wheel as _orig_get_requires_for_build_wheel,
-)
 
 
 def get_requires_for_build_wheel(config_settings: dict[str, Any] | None = None) -> list[str]:
-    reqs = _orig_get_requires_for_build_wheel()
     if not os.environ.get("MATURIN_NO_INSTALL_RUST") and not shutil.which("cargo"):
-        reqs.append("puccinialin>=0.1,<0.2")
-    return reqs
+        return ["puccinialin>=0.1,<0.2"]
+    return []
 
 
 def get_requires_for_build_sdist(config_settings: dict[str, Any] | None = None) -> list[str]:
-    reqs = _orig_get_requires_for_build_sdist()
     if not os.environ.get("MATURIN_NO_INSTALL_RUST") and not shutil.which("cargo"):
-        reqs.append("puccinialin>=0.1,<0.2")
-    return reqs
+        return ["puccinialin>=0.1,<0.2"]
+    return []

{maturin-1.8.7 → maturin-1.9.0}/src/auditwheel/audit.rs

@@ -56,7 +56,7 @@ pub enum AuditWheelError {
     UnsupportedArchitecture(Policy, String),
     /// This platform tag isn't defined by auditwheel yet
     #[error("{0} compatibility policy is not defined by auditwheel yet, pass `--auditwheel=skip` to proceed anyway")]
-    UndefinedPolicy(String),
+    UndefinedPolicy(PlatformTag),
     /// Failed to analyze external shared library dependencies of the wheel
     #[error("Failed to analyze external shared library dependencies of the wheel")]
     DependencyAnalysisError(#[source] lddtree::Error),
@@ -311,16 +311,20 @@ pub fn auditwheel_rs(
     // Find the highest possible policy, if any
     let platform_policies = match platform_tag {
         Some(PlatformTag::Manylinux { .. }) => MANYLINUX_POLICIES.clone(),
-        Some(PlatformTag::Musllinux { x, y }) => MUSLLINUX_POLICIES
+        Some(PlatformTag::Musllinux { major, minor }) => MUSLLINUX_POLICIES
             .clone()
             .into_iter()
-            .filter(|policy| policy.name == "linux" || policy.name == format!("musllinux_{x}_{y}"))
+            .filter(|policy| {
+                policy.name == "linux" || policy.name == format!("musllinux_{major}_{minor}")
+            })
             .map(|mut policy| {
                 policy.fixup_musl_libc_so_name(target.target_arch());
                 policy
             })
             .collect(),
-        None => {
+        None | Some(PlatformTag::Pypi) => {
+            // Using the default for the `pypi` tag means we're correctly using manylinux where
+            // possible.
             let mut policies = get_default_platform_policies();
             for policy in &mut policies {
                 policy.fixup_musl_libc_so_name(target.target_arch());
@@ -362,8 +366,8 @@ pub fn auditwheel_rs(
     }
 
     let policy = if let Some(platform_tag) = platform_tag {
-        let tag = platform_tag.to_string();
-        let mut policy = Policy::from_name(&tag).ok_or(AuditWheelError::UndefinedPolicy(tag))?;
+        let mut policy = Policy::from_tag(&platform_tag)
+            .ok_or(AuditWheelError::UndefinedPolicy(platform_tag))?;
         policy.fixup_musl_libc_so_name(target.target_arch());
 
         if let Some(highest_policy) = highest_policy {

{maturin-1.8.7 → maturin-1.9.0}/src/auditwheel/platform_tag.rs

@@ -7,53 +7,53 @@ use std::str::FromStr;
 #[derive(Serialize, Debug, Clone, Eq, PartialEq, Copy, Ord, PartialOrd)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub enum PlatformTag {
-    /// Use the manylinux_x_y tag
+    /// Use the `manylinux_<major>_<minor>` tag
     Manylinux {
         /// GLIBC version major
-        x: u16,
+        major: u16,
         /// GLIBC version minor
-        y: u16,
+        minor: u16,
     },
-    /// Use the musllinux_x_y tag
+    /// Use the `musllinux_<major>_<minor>` tag
     Musllinux {
         /// musl libc version major
-        x: u16,
+        major: u16,
         /// musl libc version minor
-        y: u16,
+        minor: u16,
     },
     /// Use the native linux tag
     Linux,
+    /// Ensure that a PyPI-compatible tag is used, error if the target is not supported by PyPI.
+    Pypi,
 }
 
 impl PlatformTag {
     /// `manylinux1` aka `manylinux_2_5`
     pub fn manylinux1() -> Self {
-        Self::Manylinux { x: 2, y: 5 }
+        Self::Manylinux { major: 2, minor: 5 }
     }
 
     /// `manylinux2010` aka `manylinux_2_12`
     pub fn manylinux2010() -> Self {
-        Self::Manylinux { x: 2, y: 12 }
+        Self::Manylinux {
+            major: 2,
+            minor: 12,
+        }
     }
 
     /// `manylinux2014` aka `manylinux_2_17`
     pub fn manylinux2014() -> Self {
-        Self::Manylinux { x: 2, y: 17 }
+        Self::Manylinux {
+            major: 2,
+            minor: 17,
+        }
     }
 
-    /// manylinux aliases
+    /// manylinux aliases, namely `manylinux1`, `manylinux2010` and `manylinux2014`.
     pub fn aliases(&self) -> Vec<String> {
-        match self {
-            PlatformTag::Manylinux { .. } => {
-                if let Some(policy) = Policy::from_name(&self.to_string()) {
-                    policy.aliases
-                } else {
-                    Vec::new()
-                }
-            }
-            PlatformTag::Musllinux { .. } => Vec::new(),
-            PlatformTag::Linux => Vec::new(),
-        }
+        Policy::from_tag(self)
+            .map(|policy| policy.aliases)
+            .unwrap_or_default()
     }
 
     /// Is this a portable linux platform tag
@@ -73,12 +73,18 @@ impl PlatformTag {
         matches!(self, PlatformTag::Musllinux { .. })
     }
 
+    /// Is this the PyPI compatibility option
+    pub fn is_pypi(&self) -> bool {
+        matches!(self, PlatformTag::Pypi)
+    }
+
     /// Is it supported by Rust compiler and manylinux project
     pub fn is_supported(&self) -> bool {
         match self {
-            PlatformTag::Manylinux { x, y } => (*x, *y) >= (2, 17),
+            PlatformTag::Manylinux { major, minor } => (*major, *minor) >= (2, 17),
             PlatformTag::Musllinux { .. } => true,
             PlatformTag::Linux => true,
+            PlatformTag::Pypi => true,
         }
     }
 }
@@ -86,9 +92,10 @@ impl PlatformTag {
 impl fmt::Display for PlatformTag {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match *self {
-            PlatformTag::Manylinux { x, y } => write!(f, "manylinux_{x}_{y}"),
-            PlatformTag::Musllinux { x, y } => write!(f, "musllinux_{x}_{y}"),
+            PlatformTag::Manylinux { major, minor } => write!(f, "manylinux_{major}_{minor}"),
+            PlatformTag::Musllinux { major, minor } => write!(f, "musllinux_{major}_{minor}"),
             PlatformTag::Linux => write!(f, "linux"),
+            PlatformTag::Pypi => write!(f, "pypi"),
         }
     }
 }
@@ -100,33 +107,34 @@ impl FromStr for PlatformTag {
         let value = value.to_ascii_lowercase();
         match value.as_str() {
             "off" | "linux" => Ok(PlatformTag::Linux),
+            "pypi" => Ok(PlatformTag::Pypi),
             "1" | "manylinux1" => Ok(PlatformTag::manylinux1()),
             "2010" | "manylinux2010" => Ok(PlatformTag::manylinux2010()),
             "2014" | "manylinux2014" => Ok(PlatformTag::manylinux2014()),
             _ => {
                 if let Some(value) = value.strip_prefix("musllinux_") {
                     let mut parts = value.split('_');
-                    let x = parts
+                    let major = parts
                         .next()
-                        .and_then(|x| x.parse::<u16>().ok())
+                        .and_then(|major| major.parse::<u16>().ok())
                         .ok_or("invalid musllinux option")?;
-                    let y = parts
+                    let minor = parts
                         .next()
-                        .and_then(|y| y.parse::<u16>().ok())
+                        .and_then(|minor| minor.parse::<u16>().ok())
                         .ok_or("invalid musllinux option")?;
-                    Ok(PlatformTag::Musllinux { x, y })
+                    Ok(PlatformTag::Musllinux { major, minor })
                 } else {
                     let value = value.strip_prefix("manylinux_").unwrap_or(&value);
                     let mut parts = value.split('_');
-                    let x = parts
+                    let major = parts
                         .next()
-                        .and_then(|x| x.parse::<u16>().ok())
+                        .and_then(|major| major.parse::<u16>().ok())
                         .ok_or("invalid manylinux option")?;
-                    let y = parts
+                    let minor = parts
                         .next()
-                        .and_then(|y| y.parse::<u16>().ok())
+                        .and_then(|minor| minor.parse::<u16>().ok())
                         .ok_or("invalid manylinux option")?;
-                    Ok(PlatformTag::Manylinux { x, y })
+                    Ok(PlatformTag::Manylinux { major, minor })
                 }
             }
         }

{maturin-1.8.7 → maturin-1.9.0}/src/auditwheel/policy.rs

@@ -49,7 +49,7 @@ pub struct Policy {
 impl Default for Policy {
     fn default() -> Self {
         // defaults to linux
-        Policy::from_name("linux").unwrap()
+        Policy::from_tag(&PlatformTag::Linux).unwrap()
     }
 }
 
@@ -79,17 +79,23 @@ impl Policy {
         self.name.parse().expect("unknown platform tag")
     }
 
-    /// Get policy by it's platform tag name
-    pub fn from_name(name: &str) -> Option<Self> {
-        let policies = if name.starts_with("musllinux") {
-            &MUSLLINUX_POLICIES
-        } else {
-            &MANYLINUX_POLICIES
-        };
-        policies
-            .iter()
-            .find(|p| p.name == name || p.aliases.iter().any(|alias| alias == name))
-            .cloned()
+    /// Get policy by its platform tag
+    pub fn from_tag(tag: &PlatformTag) -> Option<Self> {
+        match tag {
+            PlatformTag::Manylinux { major, minor } => {
+                let name = format!("manylinux_{major}_{minor}");
+                MANYLINUX_POLICIES.iter().find(|p| p.name == name).cloned()
+            }
+            PlatformTag::Musllinux { major, minor } => {
+                let name = format!("musllinux_{major}_{minor}");
+                MUSLLINUX_POLICIES.iter().find(|p| p.name == name).cloned()
+            }
+            PlatformTag::Linux => MANYLINUX_POLICIES
+                .iter()
+                .find(|p| p.name == "linux")
+                .cloned(),
+            PlatformTag::Pypi => unreachable!("pypi is not a policy"),
+        }
     }
 
     pub(crate) fn fixup_musl_libc_so_name(&mut self, target_arch: Arch) {
@@ -116,15 +122,20 @@ impl Policy {
 #[cfg(test)]
 mod test {
     use super::{Arch, Policy, MANYLINUX_POLICIES, MUSLLINUX_POLICIES};
+    use crate::PlatformTag;
     use pretty_assertions::assert_eq;
 
     #[test]
     fn test_load_policy() {
-        let linux = Policy::from_name("linux").unwrap();
+        let linux = Policy::from_tag(&PlatformTag::Linux).unwrap();
         assert!(linux.symbol_versions.is_empty());
         assert!(linux.lib_whitelist.is_empty());
 
-        let manylinux2010 = Policy::from_name("manylinux2010").unwrap();
+        let manylinux2010 = Policy::from_tag(&PlatformTag::Manylinux {
+            major: 2,
+            minor: 12,
+        })
+        .unwrap();
         assert!(manylinux2010.lib_whitelist.contains("libc.so.6"));
         let symbol_version = &manylinux2010.symbol_versions["x86_64"];
         assert_eq!(symbol_version["CXXABI"].len(), 4);
@@ -150,7 +161,7 @@ mod test {
 
     #[test]
     fn test_policy_musllinux_fixup_libc_so_name() {
-        let mut policy = Policy::from_name("musllinux_1_1").unwrap();
+        let mut policy = Policy::from_tag(&PlatformTag::Musllinux { major: 1, minor: 1 }).unwrap();
         policy.fixup_musl_libc_so_name(Arch::Aarch64);
         assert!(policy.lib_whitelist.contains("libc.musl-aarch64.so.1"));
     }