maturin 1.8.4__tar.gz → 1.8.7__tar.gz

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

@@ -56,12 +56,12 @@ repos:
           )
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.8
+    rev: v0.11.12
     hooks:
       - id: ruff-format
       - id: ruff
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.16.0
     hooks:
       - id: mypy
         entry: mypy maturin/

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

@@ -262,9 +262,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-xwin"
-version = "0.18.4"
+version = "0.18.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60f1954e4ffa0f4c47b3df5e6e9508706d8dcaa56152cd672dcee02930ba0326"
+checksum = "5dff83aad332bd6ee29072dd874b48892cd22c58e233c25735eb4417b3999685"
 dependencies = [
  "anyhow",
  "cargo-config2",
@@ -330,11 +330,11 @@ dependencies = [
 
 [[package]]
 name = "cbindgen"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff"
+checksum = "975982cdb7ad6a142be15bdf84aea7ec6a9e5d4d797c004d43185b24cfe4e684"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "indexmap",
  "log",
  "proc-macro2",
@@ -352,6 +352,8 @@ version = "1.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
 dependencies = [
+ "jobserver",
+ "libc",
  "shlex",
 ]
 
@@ -451,7 +453,7 @@ version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "syn",
@@ -951,7 +953,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
 ]
 
 [[package]]
@@ -1000,12 +1014,6 @@ version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1252,6 +1260,16 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
+[[package]]
+name = "jobserver"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+dependencies = [
+ "getrandom 0.3.3",
+ "libc",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.73"
@@ -1290,9 +1308,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.167"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libmimalloc-sys"
@@ -1358,6 +1376,16 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
+[[package]]
+name = "lzma-rs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e"
+dependencies = [
+ "byteorder",
+ "crc",
+]
+
 [[package]]
 name = "lzma-sys"
 version = "0.1.20"
@@ -1397,7 +1425,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.8.4"
+version = "1.8.7"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -1899,6 +1927,12 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0"
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1926,7 +1960,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -1973,7 +2007,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
  "libredox",
  "thiserror 1.0.69",
 ]
@@ -2050,7 +2084,7 @@ checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -2973,6 +3007,15 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.96"
@@ -3262,6 +3305,15 @@ version = "0.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
 [[package]]
 name = "write16"
 version = "1.0.0"
@@ -3440,10 +3492,12 @@ dependencies = [
  "displaydoc",
  "flate2",
  "indexmap",
+ "lzma-rs",
  "memchr",
  "thiserror 2.0.3",
  "time",
  "zopfli",
+ "zstd",
 ]
 
 [[package]]
@@ -3459,3 +3513,31 @@ dependencies = [
  "once_cell",
  "simd-adler32",
 ]
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.15+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+dependencies = [
+ "cc",
+ "pkg-config",
+]

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

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
 name = "maturin"
-version = "1.8.4"
+version = "1.8.7"
 description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",
@@ -45,7 +45,7 @@ glob = "0.3.0"
 cargo-config2 = "0.1.24"
 cargo_metadata = "0.19.0"
 cargo-options = "0.7.2"
-cbindgen = { version = "0.28.0", default-features = false }
+cbindgen = { version = "0.29.0", default-features = false }
 flate2 = "1.0.18"
 goblin = "0.9.0"
 platform-info = "2.0.2"
@@ -61,6 +61,8 @@ zip = { version = "2.3.0", default-features = false, features = [
     "bzip2",
     "deflate",
     "time",
+    "zstd",
+    "lzma"
 ] }
 thiserror = "2.0.3"
 fs-err = "3.0.0"
@@ -98,7 +100,7 @@ clap_complete_command = { version = "0.6.1", optional = true }
 
 # cross compile
 cargo-zigbuild = { version = "0.20.0", default-features = false, optional = true }
-cargo-xwin = { version = "0.18.4", default-features = false, optional = true }
+cargo-xwin = { version = "0.18.6", default-features = false, optional = true }
 
 # log
 tracing = "0.1.36"

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

@@ -1,5 +1,19 @@
 # Changelog
 
+## [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)
+
+## [1.8.6]
+
+* Print a message when overriding platform tag from `_PYTHON_HOST_PLATFORM` in [#2594](https://github.com/PyO3/maturin/pull/2594)
+* Use the current python interpreter's version when the abi3 feature is set with no explicit version in [#2597](https://github.com/PyO3/maturin/pull/2597)
+
+## [1.8.5]
+
+* Fix release CI build
+
 ## [1.8.4]
 
 * Install a Rust toolchain into a temporary directory when building maturin itself or a package and a Rust toolchain is
@@ -1060,7 +1074,10 @@ 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.4...HEAD
+[Unreleased]: https://github.com/pyo3/maturin/compare/v1.8.7...HEAD
+[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
 [1.8.4]: https://github.com/pyo3/maturin/compare/v1.8.3...v1.8.4
 [1.8.3]: https://github.com/pyo3/maturin/compare/v1.8.2...v1.8.3
 [1.8.2]: https://github.com/pyo3/maturin/compare/v1.8.1...v1.8.2

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

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

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

@@ -17,15 +17,23 @@ 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]:
+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"):
-        return ["puccinialin>=0.1,<0.2"]
-    return []
+        reqs.append("puccinialin>=0.1,<0.2")
+    return reqs
 
 
-def get_requires_for_build_sdist(_config_settings: dict[str, Any] | None = None) -> list[str]:
+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"):
-        return ["puccinialin>=0.1,<0.2"]
-    return []
+        reqs.append("puccinialin>=0.1,<0.2")
+    return reqs

{maturin-1.8.4 → maturin-1.8.7}/pyproject.toml

@@ -1,6 +1,10 @@
 # Workaround to bootstrap maturin on non-manylinux platforms
 [build-system]
-requires = ["setuptools", "tomli>=1.1.0 ; python_version<'3.11'", "setuptools-rust"]
+requires = [
+    "setuptools",
+    "tomli>=1.1.0 ; python_version<'3.11'",
+    "setuptools-rust>=1.11.0",
+]
 backend-path = ["maturin"]
 build-backend = "bootstrap"
 
@@ -18,17 +22,11 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 dependencies = ["tomli>=1.1.0 ; python_version<'3.11'"]
-dynamic = [
-    "version"
-]
+dynamic = ["version"]
 
 [project.optional-dependencies]
-zig = [
-    "ziglang>=0.10.0,<0.13.0",
-]
-patchelf = [
-    "patchelf",
-]
+zig = ["ziglang>=0.10.0,<0.13.0"]
+patchelf = ["patchelf"]
 
 [project.urls]
 "Source Code" = "https://github.com/PyO3/maturin"

{maturin-1.8.4 → maturin-1.8.7}/src/bridge.rs

@@ -110,6 +110,16 @@ impl TryFrom<PyO3MetadataRaw> for PyO3Metadata {
     }
 }
 
+/// Python version to use as the abi3 target.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum Abi3Version {
+    /// abi3 wheels will have a minimum Python version matching the version of
+    /// the current Python interpreter
+    CurrentPython,
+    /// abi3 wheels will have a fixed minimum Python version
+    Version(u8, u8),
+}
+
 /// The name and version of the pyo3 bindings crate
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct PyO3 {
@@ -118,7 +128,7 @@ pub struct PyO3 {
     /// pyo3 bindings crate version
     pub version: semver::Version,
     /// abi3 support
-    pub abi3: Option<(u8, u8)>,
+    pub abi3: Option<Abi3Version>,
     /// pyo3 metadata
     pub metadata: Option<PyO3Metadata>,
 }
@@ -136,7 +146,7 @@ impl PyO3 {
         } else {
             MINIMUM_PYTHON_MINOR
         };
-        if let Some((_, abi3_minor)) = self.abi3.as_ref() {
+        if let Some(Abi3Version::Version(_, abi3_minor)) = self.abi3.as_ref() {
             min_minor.max(*abi3_minor as usize)
         } else {
             min_minor

{maturin-1.8.4 → maturin-1.8.7}/src/build_context.rs

@@ -1,7 +1,9 @@
 use crate::auditwheel::{get_policy_and_libs, patchelf, relpath, AuditWheelMode};
 use crate::auditwheel::{PlatformTag, Policy};
+use crate::bridge::Abi3Version;
 use crate::build_options::CargoOptions;
 use crate::compile::{warn_missing_py_init, CompileTarget};
+use crate::compression::CompressionOptions;
 use crate::module_writer::{
     add_data, write_bin, write_bindings_module, write_cffi_module, write_python_part,
     write_uniffi_module, write_wasm_launcher, WheelWriter,
@@ -131,8 +133,8 @@ pub struct BuildContext {
     pub editable: bool,
     /// Cargo build options
     pub cargo_options: CargoOptions,
-    /// Zip compression level
-    pub compression_level: u16,
+    /// Compression options
+    pub compression: CompressionOptions,
 }
 
 /// The wheel file location and its Python version tag (e.g. `py3`).
@@ -155,7 +157,7 @@ impl BuildContext {
             BridgeModel::Bin(None) => self.build_bin_wheel(None)?,
             BridgeModel::Bin(Some(..)) => self.build_bin_wheels(&self.interpreter)?,
             BridgeModel::PyO3(crate::PyO3 { abi3, .. }) => match abi3 {
-                Some((major, minor)) => {
+                Some(Abi3Version::Version(major, minor)) => {
                     let abi3_interps: Vec<_> = self
                         .interpreter
                         .iter()
@@ -189,6 +191,41 @@ impl BuildContext {
                     }
                     built_wheels
                 }
+                Some(Abi3Version::CurrentPython) => {
+                    let abi3_interps: Vec<_> = self
+                        .interpreter
+                        .iter()
+                        .filter(|interp| interp.has_stable_api())
+                        .cloned()
+                        .collect();
+                    let non_abi3_interps: Vec<_> = self
+                        .interpreter
+                        .iter()
+                        .filter(|interp| !interp.has_stable_api())
+                        .cloned()
+                        .collect();
+                    let mut built_wheels = Vec::new();
+                    if !abi3_interps.is_empty() {
+                        let interp = abi3_interps.first().unwrap();
+                        built_wheels.extend(self.build_pyo3_wheel_abi3(
+                            &abi3_interps,
+                            interp.major as u8,
+                            interp.minor as u8,
+                        )?);
+                    }
+                    if !non_abi3_interps.is_empty() {
+                        let interp_names: HashSet<_> = non_abi3_interps
+                            .iter()
+                            .map(|interp| interp.to_string())
+                            .collect();
+                        eprintln!(
+                                "⚠️ Warning: {} does not yet support abi3 so the build artifacts will be version-specific.",
+                                interp_names.iter().join(", ")
+                            );
+                        built_wheels.extend(self.build_pyo3_wheels(&non_abi3_interps)?);
+                    }
+                    built_wheels
+                }
                 None => self.build_pyo3_wheels(&self.interpreter)?,
             },
             BridgeModel::Cffi => self.build_cffi_wheel()?,
@@ -485,7 +522,9 @@ impl BuildContext {
     /// Returns the platform part of the tag for the wheel name
     pub fn get_platform_tag(&self, platform_tags: &[PlatformTag]) -> Result<String> {
         if let Ok(host_platform) = env::var("_PYTHON_HOST_PLATFORM") {
-            return Ok(host_platform.replace(['.', '-'], "_"));
+            let override_platform = host_platform.replace(['.', '-'], "_");
+            eprintln!("🚉 Overriding platform tag from _PYTHON_HOST_PLATFORM environment variable as {override_platform}.");
+            return Ok(override_platform);
         }
 
         let target = &self.target;
@@ -633,7 +672,7 @@ impl BuildContext {
             &self.metadata24,
             &[tag.clone()],
             self.excludes(Format::Wheel)?,
-            self.compression_level,
+            self.compression,
         )?;
         self.add_external_libs(&mut writer, &[&artifact], &[ext_libs])?;
 
@@ -711,7 +750,7 @@ impl BuildContext {
             &self.metadata24,
             &[tag.clone()],
             self.excludes(Format::Wheel)?,
-            self.compression_level,
+            self.compression,
         )?;
         self.add_external_libs(&mut writer, &[&artifact], &[ext_libs])?;
 
@@ -834,7 +873,7 @@ impl BuildContext {
             &self.metadata24,
             &tags,
             self.excludes(Format::Wheel)?,
-            self.compression_level,
+            self.compression,
         )?;
         self.add_external_libs(&mut writer, &[&artifact], &[ext_libs])?;
 
@@ -906,7 +945,7 @@ impl BuildContext {
             &self.metadata24,
             &tags,
             self.excludes(Format::Wheel)?,
-            self.compression_level,
+            self.compression,
         )?;
         self.add_external_libs(&mut writer, &[&artifact], &[ext_libs])?;
 
@@ -1005,7 +1044,7 @@ impl BuildContext {
             &metadata24,
             &tags,
             self.excludes(Format::Wheel)?,
-            self.compression_level,
+            self.compression,
         )?;
 
         if self.project_layout.python_module.is_some() && self.target.is_wasi() {

{maturin-1.8.4 → maturin-1.8.7}/src/build_options.rs

@@ -1,6 +1,7 @@
 use crate::auditwheel::{AuditWheelMode, PlatformTag};
-use crate::bridge::PyO3Crate;
+use crate::bridge::{Abi3Version, PyO3Crate};
 use crate::compile::{CompileTarget, LIB_CRATE_TYPES};
+use crate::compression::CompressionOptions;
 use crate::cross_compile::{find_sysconfigdata, parse_sysconfigdata};
 use crate::project_layout::ProjectResolver;
 use crate::pyproject_toml::ToolMaturin;
@@ -217,10 +218,9 @@ pub struct BuildOptions {
     #[command(flatten)]
     pub cargo: CargoOptions,
 
-    /// Zip compresson level to use
-    #[arg(long, value_parser = clap::value_parser!(u16).range(0..=264), hide = true, default_value="6"
-    )]
-    pub compression_level: u16,
+    /// Wheel compression options
+    #[command(flatten)]
+    pub compression: CompressionOptions,
 }
 
 impl Deref for BuildOptions {
@@ -250,7 +250,7 @@ impl BuildOptions {
         match bridge {
             BridgeModel::PyO3(PyO3 { abi3, .. }) | BridgeModel::Bin(Some(PyO3 { abi3, .. })) => {
                 match abi3 {
-                    None => {
+                    None | Some(Abi3Version::CurrentPython) => {
                         let mut interpreters = Vec::new();
                         if let Some(config_file) = env::var_os("PYO3_CONFIG_FILE") {
                             let interpreter_config =
@@ -385,7 +385,7 @@ impl BuildOptions {
 
                         Ok(interpreters)
                     }
-                    Some((major, minor)) => {
+                    Some(Abi3Version::Version(major, minor)) => {
                         let found_interpreters =
                             find_interpreter_in_host(bridge, interpreter, target, requires_python)
                                 .or_else(|err| {
@@ -587,6 +587,7 @@ impl BuildContextBuilder {
             editable,
             sdist_only,
         } = self;
+        build_options.compression.validate();
         let ProjectResolver {
             project_layout,
             cargo_toml_path,
@@ -807,7 +808,7 @@ impl BuildContextBuilder {
             universal2,
             editable,
             cargo_options,
-            compression_level: build_options.compression_level,
+            compression: build_options.compression,
         })
     }
 }
@@ -990,7 +991,7 @@ fn filter_cargo_targets(
 }
 
 /// pyo3 supports building abi3 wheels if the unstable-api feature is not selected
-fn has_abi3(deps: &HashMap<&str, &Node>) -> Result<Option<(u8, u8)>> {
+fn has_abi3(deps: &HashMap<&str, &Node>) -> Result<Option<Abi3Version>> {
     for &lib in PYO3_BINDING_CRATES.iter() {
         let lib = lib.as_str();
         if let Some(pyo3_crate) = deps.get(lib) {
@@ -1012,13 +1013,11 @@ fn has_abi3(deps: &HashMap<&str, &Node>) -> Result<Option<(u8, u8)>> {
                 .context(format!("Bogus {lib} cargo features"))?
                 .into_iter()
                 .min();
-            if abi3_selected && min_abi3_version.is_none() {
-                bail!(
-                        "You have selected the `abi3` feature but not a minimum version (e.g. the `abi3-py36` feature). \
-                        maturin needs a minimum version feature to build abi3 wheels."
-                    )
+            match min_abi3_version {
+                Some((major, minor)) => return Ok(Some(Abi3Version::Version(major, minor))),
+                None if abi3_selected => return Ok(Some(Abi3Version::CurrentPython)),
+                None => {}
             }
-            return Ok(min_abi3_version);
         }
     }
     Ok(None)
@@ -1212,13 +1211,13 @@ pub fn find_bridge(cargo_metadata: &Metadata, bridge: Option<&str>) -> Result<Br
                 );
             }
 
-            return if let Some((major, minor)) = has_abi3(&deps)? {
-                eprintln!("🔗 Found {lib} bindings with abi3 support for Python ≥ {major}.{minor}");
+            return if let Some(abi3_version) = has_abi3(&deps)? {
+                eprintln!("🔗 Found {lib} bindings with abi3 support");
                 let pyo3 = bridge.pyo3().expect("should be pyo3 bindings");
                 let bindings = PyO3 {
                     crate_name: lib,
                     version: pyo3.version.clone(),
-                    abi3: Some((major, minor)),
+                    abi3: Some(abi3_version),
                     metadata: pyo3.metadata.clone(),
                 };
                 Ok(BridgeModel::PyO3(bindings))
@@ -1270,9 +1269,9 @@ fn find_interpreter(
     if !interpreter.is_empty() {
         let mut missing = Vec::new();
         for interp in interpreter {
-            match PythonInterpreter::check_executable(interp.clone(), target, bridge) {
-                Ok(Some(interp)) => found_interpreters.push(interp),
-                _ => missing.push(interp.clone()),
+            match PythonInterpreter::check_executable(interp.clone(), target, bridge)? {
+                Some(interp) => found_interpreters.push(interp),
+                None => missing.push(interp.clone()),
             }
         }
         if !missing.is_empty() {
@@ -1403,8 +1402,8 @@ fn find_interpreter_in_sysconfig(
                 format!("Failed to find a {python_impl} {ver_major}.{ver_minor} interpreter in known sysconfig")
             })?;
         debug!(
-            "Found {} {}.{} in bundled sysconfig",
-            sysconfig.interpreter_kind, sysconfig.major, sysconfig.minor,
+            "Found {} {}.{}{} in bundled sysconfig",
+            sysconfig.interpreter_kind, sysconfig.major, sysconfig.minor, sysconfig.abiflags
         );
         interpreters.push(PythonInterpreter::from_config(sysconfig.clone()));
     }
@@ -1622,12 +1621,12 @@ mod test {
 
         let bridge = BridgeModel::PyO3(PyO3 {
             crate_name: PyO3Crate::PyO3,
-            version: semver::Version::new(0, 24, 1),
-            abi3: Some((3, 7)),
+            version: semver::Version::new(0, 25, 0),
+            abi3: Some(Abi3Version::Version(3, 7)),
             metadata: Some(PyO3Metadata {
                 cpython: PyO3VersionMetadata {
                     min_minor: 7,
-                    max_minor: 13,
+                    max_minor: 14,
                 },
                 pypy: PyO3VersionMetadata {
                     min_minor: 9,

{maturin-1.8.4 → maturin-1.8.7}/src/ci.rs

@@ -664,7 +664,7 @@ jobs:\n",
 #[cfg(test)]
 mod tests {
     use super::GenerateCI;
-    use crate::{bridge::PyO3Crate, BridgeModel, PyO3};
+    use crate::{bridge::PyO3Crate, Abi3Version, BridgeModel, PyO3};
     use expect_test::expect;
     use semver::Version;
 
@@ -874,7 +874,7 @@ mod tests {
                 &BridgeModel::PyO3(PyO3 {
                     crate_name: PyO3Crate::PyO3,
                     version: Version::new(0, 23, 0),
-                    abi3: Some((3, 7)),
+                    abi3: Some(Abi3Version::Version(3, 7)),
                     metadata: None,
                 }),
                 false,
@@ -1086,7 +1086,7 @@ mod tests {
             &BridgeModel::PyO3(PyO3 {
                 crate_name: PyO3Crate::PyO3,
                 version: Version::new(0, 23, 0),
-                abi3: Some((3, 7)),
+                abi3: Some(Abi3Version::Version(3, 7)),
                 metadata: None,
             }),
             false,

maturin-1.8.7/src/compression.rs

@@ -0,0 +1,88 @@
+use clap::{CommandFactory, ValueEnum};
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Default, Debug, Copy, Clone, PartialEq, Eq, ValueEnum)]
+/// Wheel ZIP compression method. May only be compatible with recent package manager versions.
+// See https://docs.rs/zip/latest/zip/write/struct.FileOptions.html#method.compression_level
+pub enum CompressionMethod {
+    #[default]
+    /// Deflate compression (levels 0-9, default 6)
+    // NOTE: The levels will change if we enable Zopfli!
+    Deflated,
+    /// No compression
+    Stored,
+    /// BZIP2 compression (levels 0-9, default 6)
+    Bzip2,
+    /// Zstandard compression (supported from Python 3.14; levels -7-22, default 3)
+    Zstd,
+}
+impl CompressionMethod {
+    /// Default level for this compression method
+    // NOTE: This should match the default from the `zip` crates.
+    pub fn default_level(self) -> i64 {
+        match self {
+            CompressionMethod::Deflated => 6,
+            CompressionMethod::Stored => 0,
+            CompressionMethod::Bzip2 => 6,
+            CompressionMethod::Zstd => 3,
+        }
+    }
+    /// Allowed levels for the method.
+    pub fn level_range(self) -> std::ops::RangeInclusive<i64> {
+        match self {
+            CompressionMethod::Deflated => 0..=9,
+            CompressionMethod::Stored => 0..=0,
+            CompressionMethod::Bzip2 => 0..=9,
+            CompressionMethod::Zstd => -7..=22,
+        }
+    }
+}
+impl From<CompressionMethod> for zip::CompressionMethod {
+    fn from(source: CompressionMethod) -> Self {
+        match source {
+            CompressionMethod::Deflated => zip::CompressionMethod::Deflated,
+            CompressionMethod::Stored => zip::CompressionMethod::Stored,
+            CompressionMethod::Bzip2 => zip::CompressionMethod::Bzip2,
+            CompressionMethod::Zstd => zip::CompressionMethod::ZSTD,
+        }
+    }
+}
+#[derive(Debug, Default, Serialize, Deserialize, clap::Parser, Clone, Copy, Eq, PartialEq)]
+/// Wheel ZIP compression options.
+pub struct CompressionOptions {
+    /// Zip compression method. Only Stored and Deflated are currently compatible with all
+    /// package managers.
+    #[arg(long, value_enum, default_value_t = CompressionMethod::default())]
+    pub compression_method: CompressionMethod,
+
+    /// Zip compression level. Defaults to method default.
+    #[arg(long, allow_negative_numbers = true)]
+    pub compression_level: Option<i64>,
+}
+impl CompressionOptions {
+    /// Validate arguments, exit on error
+    pub fn validate(&self) {
+        if let Some(level) = self.compression_level {
+            let range = self.compression_method.level_range();
+            if !range.contains(&level) {
+                let mut cmd = Self::command();
+                cmd.error(
+                    clap::error::ErrorKind::ArgumentConflict,
+                    format!(
+                        "Invalid level {} for compression method {:?}. Use a level in range {:?}",
+                        level, self.compression_method, range
+                    ),
+                )
+                .exit();
+            }
+        }
+    }
+    /// No compression
+    pub fn none() -> Self {
+        let method = CompressionMethod::Stored;
+        Self {
+            compression_method: method,
+            compression_level: Some(method.default_level()),
+        }
+    }
+}

{maturin-1.8.4 → maturin-1.8.7}/src/develop.rs

@@ -1,5 +1,6 @@
 use crate::auditwheel::AuditWheelMode;
 use crate::build_options::CargoOptions;
+use crate::compression::CompressionOptions;
 use crate::target::detect_arch_from_python;
 use crate::BuildContext;
 use crate::BuildOptions;
@@ -229,6 +230,10 @@ pub struct DevelopOptions {
     /// Use `uv` to install packages instead of `pip`
     #[arg(long)]
     pub uv: bool,
+
+    /// Wheel compression options
+    #[command(flatten)]
+    pub compression: CompressionOptions,
 }
 
 #[instrument(skip_all)]
@@ -387,7 +392,10 @@ pub fn develop(develop_options: DevelopOptions, venv_dir: &Path) -> Result<()> {
         pip_path,
         cargo_options,
         uv,
+        compression,
     } = develop_options;
+    compression.validate();
+
     let mut target_triple = cargo_options.target.clone();
     let target = Target::from_target_triple(cargo_options.target.as_ref())?;
     let python = target.get_venv_python(venv_dir);
@@ -416,7 +424,7 @@ pub fn develop(develop_options: DevelopOptions, venv_dir: &Path) -> Result<()> {
             target: target_triple,
             ..cargo_options
         },
-        compression_level: 6,
+        compression,
     };
 
     let build_context = build_options

{maturin-1.8.4 → maturin-1.8.7}/src/lib.rs

@@ -23,11 +23,12 @@
 
 #![deny(missing_docs)]
 
-pub use crate::bridge::{BridgeModel, PyO3, PyO3Crate};
+pub use crate::bridge::{Abi3Version, BridgeModel, PyO3, PyO3Crate};
 pub use crate::build_context::{BuildContext, BuiltWheelMetadata};
 pub use crate::build_options::{BuildOptions, CargoOptions, TargetTriple};
 pub use crate::cargo_toml::CargoToml;
 pub use crate::compile::{compile, BuildArtifact};
+pub use crate::compression::{CompressionMethod, CompressionOptions};
 pub use crate::develop::{develop, DevelopOptions};
 #[cfg(feature = "schemars")]
 pub use crate::generate_json_schema::{generate_json_schema, GenerateJsonSchemaOptions, Mode};
@@ -53,6 +54,7 @@ mod cargo_toml;
 /// Generate CI configuration
 pub mod ci;
 mod compile;
+mod compression;
 mod cross_compile;
 mod develop;
 mod generate_json_schema;

{maturin-1.8.4 → maturin-1.8.7}/src/main.rs

@@ -13,8 +13,8 @@ use clap::{Parser, Subcommand};
 #[cfg(feature = "scaffolding")]
 use maturin::{ci::GenerateCI, init_project, new_project, GenerateProjectOptions};
 use maturin::{
-    develop, write_dist_info, BridgeModel, BuildOptions, CargoOptions, DevelopOptions, PathWriter,
-    PlatformTag, PythonInterpreter, Target, TargetTriple,
+    develop, write_dist_info, Abi3Version, BridgeModel, BuildOptions, CargoOptions, DevelopOptions,
+    PathWriter, PlatformTag, PythonInterpreter, Target, TargetTriple,
 };
 #[cfg(feature = "schemars")]
 use maturin::{generate_json_schema, GenerateJsonSchemaOptions};
@@ -284,10 +284,19 @@ fn pep517(subcommand: Pep517Command) -> Result<()> {
             let tags = match context.bridge() {
                 BridgeModel::PyO3(bindings) | BridgeModel::Bin(Some(bindings)) => {
                     match bindings.abi3 {
-                        Some((major, minor)) => {
+                        Some(Abi3Version::Version(major, minor)) => {
                             let platform = context.get_platform_tag(&[PlatformTag::Linux])?;
                             vec![format!("cp{major}{minor}-abi3-{platform}")]
                         }
+                        Some(Abi3Version::CurrentPython) => {
+                            let interp = &context.interpreter[0];
+                            let platform = context.get_platform_tag(&[PlatformTag::Linux])?;
+                            vec![format!(
+                                "cp{major}{minor}-abi3-{platform}",
+                                major = interp.major,
+                                minor = interp.minor
+                            )]
+                        }
                         None => {
                             vec![context.interpreter[0].get_tag(&context, &[PlatformTag::Linux])?]
                         }

{maturin-1.8.4 → maturin-1.8.7}/src/metadata.rs

@@ -416,7 +416,7 @@ impl Metadata24 {
         let metadata = Metadata24 {
             // name, version and metadata_version are added through metadata24::new()
             // Mapped from cargo metadata
-            summary: package.description.clone(),
+            summary: package.description.as_ref().map(|d| d.trim().into()),
             description,
             description_content_type,
             keywords: if package.keywords.is_empty() {
@@ -688,7 +688,9 @@ mod test {
             authors = ["konstin <konstin@mailbox.org>"]
             name = "info-project"
             version = "0.1.0"
-            description = "A test project"
+            description = """
+A test project
+            """
             homepage = "https://example.org"
             readme = "REPLACE_README_PATH"
             keywords = ["ffi", "test"]

{maturin-1.8.4 → maturin-1.8.7}/src/module_writer.rs

@@ -1,4 +1,5 @@
 //! The wheel format is (mostly) specified in PEP 427
+use crate::compression::{CompressionMethod, CompressionOptions};
 use crate::project_layout::ProjectLayout;
 use crate::target::Os;
 use crate::{
@@ -239,7 +240,27 @@ pub struct WheelWriter {
     wheel_path: PathBuf,
     file_tracker: FileTracker,
     excludes: Override,
-    compression_level: u16,
+    compression: CompressionOptions,
+}
+impl CompressionOptions {
+    fn get_file_options(&self) -> zip::write::FileOptions<()> {
+        let method = if cfg!(feature = "faster-tests") {
+            // Unlike users which can use the develop subcommand, the tests have to go through
+            // packing a zip which pip than has to unpack. This makes this 2-3 times faster
+            CompressionMethod::Stored
+        } else {
+            self.compression_method
+        };
+
+        let mut options =
+            zip::write::SimpleFileOptions::default().compression_method(method.into());
+        // `zip` also has default compression levels, which should match our own, but we pass them
+        // explicitly to ensure consistency.
+        options = options.compression_level(Some(
+            self.compression_level.unwrap_or(method.default_level()),
+        ));
+        options
+    }
 }
 
 impl ModuleWriter for WheelWriter {
@@ -267,20 +288,11 @@ impl ModuleWriter for WheelWriter {
         // The zip standard mandates using unix style paths
         let target = target.to_str().unwrap().replace('\\', "/");
 
-        // Unlike users which can use the develop subcommand, the tests have to go through
-        // packing a zip which pip than has to unpack. This makes this 2-3 times faster
-        let compression_method = if cfg!(feature = "faster-tests") || self.compression_level == 0 {
-            zip::CompressionMethod::Stored
-        } else {
-            zip::CompressionMethod::Deflated
-        };
+        let mut options = self
+            .compression
+            .get_file_options()
+            .unix_permissions(permissions);
 
-        let mut options = zip::write::SimpleFileOptions::default()
-            .unix_permissions(permissions)
-            .compression_method(compression_method);
-        if self.compression_level != 0 {
-            options = options.compression_level(Some(self.compression_level as i64));
-        }
         let mtime = self.mtime().ok();
         if let Some(mtime) = mtime {
             options = options.last_modified_time(mtime);
@@ -306,7 +318,7 @@ impl WheelWriter {
         metadata24: &Metadata24,
         tags: &[String],
         excludes: Override,
-        compression_level: u16,
+        compression: CompressionOptions,
     ) -> Result<WheelWriter> {
         let wheel_path = wheel_dir.join(format!(
             "{}-{}-{}.whl",
@@ -324,7 +336,7 @@ impl WheelWriter {
             wheel_path,
             file_tracker: FileTracker::default(),
             excludes,
-            compression_level,
+            compression,
         };
 
         write_dist_info(&mut builder, metadata24, tags)?;
@@ -383,17 +395,7 @@ impl WheelWriter {
 
     /// Creates the record file and finishes the zip
     pub fn finish(mut self) -> Result<PathBuf, io::Error> {
-        let compression_method = if cfg!(feature = "faster-tests") || self.compression_level == 0 {
-            zip::CompressionMethod::Stored
-        } else {
-            zip::CompressionMethod::Deflated
-        };
-
-        let mut options =
-            zip::write::SimpleFileOptions::default().compression_method(compression_method);
-        if self.compression_level != 0 {
-            options = options.compression_level(Some(self.compression_level as i64));
-        }
+        let mut options = self.compression.get_file_options();
         let mtime = self.mtime().ok();
         if let Some(mtime) = mtime {
             options = options.last_modified_time(mtime);

{maturin-1.8.4 → maturin-1.8.7}/src/python_interpreter/mod.rs

@@ -427,7 +427,7 @@ fn fun_with_abiflags(
     if message.interpreter == "pypy" || message.interpreter == "graalvm" {
         // pypy and graalpy do not specify abi flags
         Ok("".to_string())
-    } else if message.system == "windows" {
+    } else if message.system == "windows" && message.minor < 14 {
         if matches!(message.abiflags.as_deref(), Some("") | None) {
             // windows has a few annoying cases, but its abiflags in sysconfig always empty
             // python <= 3.7 has "m"
@@ -443,7 +443,7 @@ fn fun_with_abiflags(
                 Ok("".to_string())
             }
         } else {
-            bail!("A python 3 interpreter on Windows does not define abiflags in its sysconfig ಠ_ಠ")
+            bail!("A python 3 interpreter on Windows does not define abiflags in its sysconfig before Python 3.14 ಠ_ಠ")
         }
     } else if let Some(ref abiflags) = message.abiflags {
         if message.minor >= 8 {

{maturin-1.8.4 → maturin-1.8.7}/src/templates/Cargo.toml.j2

@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 {% if bindings == "pyo3" -%}
-pyo3 = "0.24.0"
+pyo3 = "0.25.0"
 {% elif bindings == "uniffi" -%}
 uniffi = "0.28.0"