maturin 1.7.5__tar.gz → 1.7.6b1__tar.gz

{maturin-1.7.5 → maturin-1.7.6b1}/Cargo.lock

@@ -306,20 +306,20 @@ dependencies = [
 
 [[package]]
 name = "cbindgen"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49"
+checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb"
 dependencies = [
  "heck 0.4.1",
- "indexmap 1.9.3",
+ "indexmap",
  "log",
  "proc-macro2",
  "quote",
  "serde",
  "serde_json",
- "syn 1.0.109",
+ "syn 2.0.89",
  "tempfile",
- "toml 0.5.11",
+ "toml",
 ]
 
 [[package]]
@@ -364,7 +364,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown",
  "stacker",
 ]
 
@@ -960,12 +960,6 @@ dependencies = [
  "scroll",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -1168,16 +1162,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.5.0"
@@ -1185,7 +1169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown",
  "serde",
 ]
 
@@ -1357,7 +1341,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.7.5"
+version = "1.7.6-beta.1"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -1384,7 +1368,7 @@ dependencies = [
  "glob",
  "goblin",
  "ignore",
- "indexmap 2.5.0",
+ "indexmap",
  "indoc",
  "itertools",
  "keyring",
@@ -1419,7 +1403,7 @@ dependencies = [
  "textwrap",
  "thiserror",
  "time",
- "toml 0.8.15",
+ "toml",
  "toml_edit 0.22.16",
  "tracing",
  "tracing-subscriber",
@@ -1465,9 +1449,9 @@ dependencies = [
 
 [[package]]
 name = "minijinja"
-version = "1.0.21"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e877d961d4f96ce13615862322df7c0b6d169d40cab71a7ef3f9b9e594451e"
+checksum = "2c37e1b517d1dcd0e51dc36c4567b9d5a29262b3ec8da6cb5d35e27a8fb529b5"
 dependencies = [
  "serde",
 ]
@@ -1815,11 +1799,11 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef7061023bcb58a0fc4a4bbe9819c13b0dca7c2abc14da14f5ecc1532ab3a36a"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap",
  "pep440_rs",
  "pep508_rs",
  "serde",
- "toml 0.8.15",
+ "toml",
 ]
 
 [[package]]
@@ -2580,15 +2564,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.15"
@@ -2616,7 +2591,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -2627,7 +2602,7 @@ version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3198,7 +3173,7 @@ dependencies = [
  "serde_json",
  "sha2",
  "tempfile",
- "toml 0.8.15",
+ "toml",
  "tracing",
  "tracing-subscriber",
  "twox-hash",

{maturin-1.7.5 → maturin-1.7.6b1}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
 name = "maturin"
-version = "1.7.5"
+version = "1.7.6-beta.1"
 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.18.0"
 cargo-options = "0.7.2"
-cbindgen = { version = "0.26.0", default-features = false }
+cbindgen = { version = "0.27.0", default-features = false }
 flate2 = "1.0.18"
 goblin = "0.9.0"
 platform-info = "2.0.2"
@@ -107,7 +107,7 @@ tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 # project scaffolding, maturin new/init/generate-ci
 dialoguer = { version = "0.11.0", default-features = false, optional = true }
 console = { version = "0.15.4", optional = true }
-minijinja = { version = "1.0.7", optional = true }
+minijinja = { version = "2.5.0", optional = true }
 
 # upload
 bytesize = { version = "1.0.1", optional = true }

{maturin-1.7.5 → maturin-1.7.6b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maturin
-Version: 1.7.5
+Version: 1.7.6b1
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython

{maturin-1.7.5 → maturin-1.7.6b1}/src/build_context.rs

@@ -7,7 +7,6 @@ use crate::module_writer::{
     write_uniffi_module, write_wasm_launcher, WheelWriter,
 };
 use crate::project_layout::ProjectLayout;
-use crate::python_interpreter::InterpreterKind;
 use crate::source_distribution::source_distribution;
 use crate::target::{Arch, Os};
 use crate::{
@@ -235,12 +234,7 @@ impl BuildContext {
                 if !non_abi3_interps.is_empty() {
                     let interp_names: HashSet<_> = non_abi3_interps
                         .iter()
-                        .map(|interp| match interp.interpreter_kind {
-                            InterpreterKind::CPython | InterpreterKind::GraalPy => {
-                                interp.implementation_name.to_string()
-                            }
-                            InterpreterKind::PyPy => "PyPy".to_string(),
-                        })
+                        .map(|interp| format!("{}{}{}", interp, interp.major, interp.minor))
                         .collect();
                     eprintln!(
                         "⚠️ Warning: {} does not yet support abi3 so the build artifacts will be version-specific.",

{maturin-1.7.5 → maturin-1.7.6b1}/src/build_options.rs

@@ -1266,12 +1266,7 @@ fn find_interpreter_in_sysconfig(
             )
         } else if let Some(ver) = python.strip_prefix("python") {
             // Also accept things like `python3.13t` for free-threaded python
-            let (ver, abiflags) =
-                if let Some(ver) = ver.strip_prefix('-').unwrap_or(ver).strip_suffix('t') {
-                    (ver, "t")
-                } else {
-                    (ver, "")
-                };
+            let (ver, abiflags) = maybe_free_threaded(ver.strip_prefix('-').unwrap_or(ver));
             (InterpreterKind::CPython, ver, abiflags)
         } else if python
             .chars()
@@ -1280,7 +1275,8 @@ fn find_interpreter_in_sysconfig(
             .unwrap_or(false)
         {
             // Eg: -i 3.9 without interpreter kind, assume it's CPython
-            (InterpreterKind::CPython, &*python, "")
+            let (ver, abiflags) = maybe_free_threaded(&python);
+            (InterpreterKind::CPython, ver, abiflags)
         } else {
             // if interpreter not known
             if std::path::Path::new(&python).is_file() {
@@ -1319,6 +1315,14 @@ fn find_interpreter_in_sysconfig(
     Ok(interpreters)
 }
 
+fn maybe_free_threaded(python_ver: &str) -> (&str, &str) {
+    if let Some(ver) = python_ver.strip_suffix('t') {
+        (ver, "t")
+    } else {
+        (python_ver, "")
+    }
+}
+
 /// We need to pass the global flags to cargo metadata
 /// (https://github.com/PyO3/maturin/issues/211 and https://github.com/PyO3/maturin/issues/472),
 /// but we can't pass all the extra args, as e.g. `--target` isn't supported, so this tries to

{maturin-1.7.5 → maturin-1.7.6b1}/src/ci.rs

@@ -376,17 +376,29 @@ jobs:\n",
           sccache: 'true'
 "
             ));
-            match platform {
-                Platform::ManyLinux => {
-                    conf.push_str("          manylinux: auto\n");
-                }
-                Platform::Musllinux => {
-                    conf.push_str("          manylinux: musllinux_1_2\n");
-                }
-                Platform::Emscripten => {
-                    conf.push_str("          rust-toolchain: nightly\n");
+            let maturin_action_args = match platform {
+                Platform::ManyLinux => "manylinux: auto",
+                Platform::Musllinux => "manylinux: musllinux_1_2",
+                Platform::Emscripten => "rust-toolchain: nightly",
+                _ => "",
+            };
+            if !maturin_action_args.is_empty() {
+                conf.push_str(&format!("          {maturin_action_args}\n"));
+            }
+            if is_abi3 {
+                // build free-threaded wheel for python3.13t
+                conf.push_str(&format!(
+                    "      - name: Build free-threaded wheels
+          uses: PyO3/maturin-action@v1
+          with:
+            target: ${{{{ matrix.platform.target }}}}
+            args: --release --out dist{maturin_args} -i python3.13t
+            sccache: 'true'
+  "
+                ));
+                if !maturin_action_args.is_empty() {
+                    conf.push_str(&format!("          {maturin_action_args}\n"));
                 }
-                _ => {}
             }
             // upload wheels
             let artifact_name = match platform {
@@ -904,6 +916,13 @@ mod tests {
                       args: --release --out dist
                       sccache: 'true'
                       manylinux: auto
+                  - name: Build free-threaded wheels
+                      uses: PyO3/maturin-action@v1
+                      with:
+                        target: ${{ matrix.platform.target }}
+                        args: --release --out dist -i python3.13t
+                        sccache: 'true'
+                        manylinux: auto
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
@@ -935,6 +954,13 @@ mod tests {
                       args: --release --out dist
                       sccache: 'true'
                       manylinux: musllinux_1_2
+                  - name: Build free-threaded wheels
+                      uses: PyO3/maturin-action@v1
+                      with:
+                        target: ${{ matrix.platform.target }}
+                        args: --release --out dist -i python3.13t
+                        sccache: 'true'
+                        manylinux: musllinux_1_2
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
@@ -962,7 +988,13 @@ mod tests {
                       target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
-                  - name: Upload wheels
+                  - name: Build free-threaded wheels
+                      uses: PyO3/maturin-action@v1
+                      with:
+                        target: ${{ matrix.platform.target }}
+                        args: --release --out dist -i python3.13t
+                        sccache: 'true'
+                    - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
                       name: wheels-windows-${{ matrix.platform.target }}
@@ -988,7 +1020,13 @@ mod tests {
                       target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
-                  - name: Upload wheels
+                  - name: Build free-threaded wheels
+                      uses: PyO3/maturin-action@v1
+                      with:
+                        target: ${{ matrix.platform.target }}
+                        args: --release --out dist -i python3.13t
+                        sccache: 'true'
+                    - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
                       name: wheels-macos-${{ matrix.platform.target }}
@@ -1081,6 +1119,13 @@ mod tests {
                       args: --release --out dist
                       sccache: 'true'
                       manylinux: auto
+                  - name: Build free-threaded wheels
+                      uses: PyO3/maturin-action@v1
+                      with:
+                        target: ${{ matrix.platform.target }}
+                        args: --release --out dist -i python3.13t
+                        sccache: 'true'
+                        manylinux: auto
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
@@ -1112,6 +1157,13 @@ mod tests {
                       args: --release --out dist
                       sccache: 'true'
                       manylinux: musllinux_1_2
+                  - name: Build free-threaded wheels
+                      uses: PyO3/maturin-action@v1
+                      with:
+                        target: ${{ matrix.platform.target }}
+                        args: --release --out dist -i python3.13t
+                        sccache: 'true'
+                        manylinux: musllinux_1_2
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
@@ -1139,7 +1191,13 @@ mod tests {
                       target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
-                  - name: Upload wheels
+                  - name: Build free-threaded wheels
+                      uses: PyO3/maturin-action@v1
+                      with:
+                        target: ${{ matrix.platform.target }}
+                        args: --release --out dist -i python3.13t
+                        sccache: 'true'
+                    - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
                       name: wheels-windows-${{ matrix.platform.target }}
@@ -1165,7 +1223,13 @@ mod tests {
                       target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
-                  - name: Upload wheels
+                  - name: Build free-threaded wheels
+                      uses: PyO3/maturin-action@v1
+                      with:
+                        target: ${{ matrix.platform.target }}
+                        args: --release --out dist -i python3.13t
+                        sccache: 'true'
+                    - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
                       name: wheels-macos-${{ matrix.platform.target }}

{maturin-1.7.5 → maturin-1.7.6b1}/src/python_interpreter/config.rs

@@ -120,6 +120,11 @@ impl InterpreterConfig {
                 })
             }
             (Os::Windows, CPython) => {
+                let abiflags = if python_version < (3, 8) {
+                    "m".to_string()
+                } else {
+                    abiflags.to_string()
+                };
                 let ext_suffix = if python_version < (3, 8) {
                     ".pyd".to_string()
                 } else {
@@ -135,8 +140,7 @@ impl InterpreterConfig {
                     major,
                     minor,
                     interpreter_kind: CPython,
-                    // abiflags is always empty on Windows
-                    abiflags: String::new(),
+                    abiflags,
                     ext_suffix,
                     pointer_width: Some(target.pointer_width()),
                     gil_disabled,
@@ -152,7 +156,6 @@ impl InterpreterConfig {
                     major,
                     minor,
                     interpreter_kind: PyPy,
-                    // abiflags is always empty on Windows
                     abiflags: String::new(),
                     ext_suffix,
                     pointer_width: Some(target.pointer_width()),

{maturin-1.7.5 → maturin-1.7.6b1}/src/python_interpreter/mod.rs

@@ -1,7 +1,7 @@
 pub use self::config::InterpreterConfig;
 use crate::auditwheel::PlatformTag;
 use crate::{BridgeModel, BuildContext, Target};
-use anyhow::{bail, format_err, Context, Result};
+use anyhow::{bail, ensure, format_err, Context, Result};
 use pep440_rs::{Version, VersionSpecifiers};
 use regex::Regex;
 use serde::Deserialize;
@@ -427,7 +427,19 @@ fn fun_with_abiflags(
         Ok("".to_string())
     } else if message.system == "windows" {
         if matches!(message.abiflags.as_deref(), Some("") | None) {
-            Ok("".to_string())
+            // windows has a few annoying cases, but its abiflags in sysconfig always empty
+            // python <= 3.7 has "m"
+            if message.minor <= 7 {
+                Ok("m".to_string())
+            } else if message.gil_disabled {
+                ensure!(
+                    message.minor >= 13,
+                    "gil_disabled is only available in python 3.13+ ಠ_ಠ"
+                );
+                Ok("t".to_string())
+            } else {
+                Ok("".to_string())
+            }
         } else {
             bail!("A python 3 interpreter on Windows does not define abiflags in its sysconfig ಠ_ಠ")
         }
@@ -499,23 +511,13 @@ impl PythonInterpreter {
         } else {
             match self.interpreter_kind {
                 InterpreterKind::CPython => {
-                    if target.is_unix() {
-                        format!(
-                            "cp{major}{minor}-cp{major}{minor}{abiflags}-{platform}",
-                            major = self.major,
-                            minor = self.minor,
-                            abiflags = self.abiflags,
-                            platform = platform
-                        )
-                    } else {
-                        // On windows the abiflags are missing, but this seems to work
-                        format!(
-                            "cp{major}{minor}-none-{platform}",
-                            major = self.major,
-                            minor = self.minor,
-                            platform = platform
-                        )
-                    }
+                    format!(
+                        "cp{major}{minor}-cp{major}{minor}{abiflags}-{platform}",
+                        major = self.major,
+                        minor = self.minor,
+                        abiflags = self.abiflags,
+                        platform = platform
+                    )
                 }
                 InterpreterKind::PyPy => {
                     // pypy uses its version as part of the ABI, e.g.