maturin 1.8.4__tar.gz → 1.8.6__tar.gz

{maturin-1.8.4 → maturin-1.8.6}/.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.8
+    rev: v0.11.9
     hooks:
       - id: ruff-format
       - id: ruff

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

@@ -1397,7 +1397,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.8.4"
+version = "1.8.6"
 dependencies = [
  "anyhow",
  "base64 0.21.7",

{maturin-1.8.4 → maturin-1.8.6}/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.6"
 description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",

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

@@ -1,5 +1,14 @@
 # Changelog
 
+## [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 +1069,9 @@ 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.6...HEAD
+[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.6}/PKG-INFO

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

{maturin-1.8.4 → maturin-1.8.6}/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.6}/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.6}/src/build_context.rs

@@ -1,5 +1,6 @@
 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::module_writer::{
@@ -155,7 +156,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 +190,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 +521,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;

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

@@ -1,5 +1,5 @@
 use crate::auditwheel::{AuditWheelMode, PlatformTag};
-use crate::bridge::PyO3Crate;
+use crate::bridge::{Abi3Version, PyO3Crate};
 use crate::compile::{CompileTarget, LIB_CRATE_TYPES};
 use crate::cross_compile::{find_sysconfigdata, parse_sysconfigdata};
 use crate::project_layout::ProjectResolver;
@@ -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| {
@@ -990,7 +990,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 +1012,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 +1210,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))
@@ -1623,7 +1621,7 @@ mod test {
         let bridge = BridgeModel::PyO3(PyO3 {
             crate_name: PyO3Crate::PyO3,
             version: semver::Version::new(0, 24, 1),
-            abi3: Some((3, 7)),
+            abi3: Some(Abi3Version::Version(3, 7)),
             metadata: Some(PyO3Metadata {
                 cpython: PyO3VersionMetadata {
                     min_minor: 7,

{maturin-1.8.4 → maturin-1.8.6}/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.4 → maturin-1.8.6}/src/lib.rs

@@ -23,7 +23,7 @@
 
 #![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;

{maturin-1.8.4 → maturin-1.8.6}/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])?]
                         }