maturin 1.5.0__tar.gz → 1.5.1__tar.gz

{maturin-1.5.0 → maturin-1.5.1}/.pre-commit-config.yaml

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

{maturin-1.5.0 → maturin-1.5.1}/Cargo.lock

@@ -390,20 +390,9 @@ checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d"
 dependencies = [
  "clap",
  "clap_complete",
- "clap_complete_fig",
  "clap_complete_nushell",
 ]
 
-[[package]]
-name = "clap_complete_fig"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e571d70e22ec91d34e1c5317c8308035a2280d925167646bf094fc5de1737c"
-dependencies = [
- "clap",
- "clap_complete",
-]
-
 [[package]]
 name = "clap_complete_nushell"
 version = "0.1.11"
@@ -990,9 +979,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libredox"
@@ -1065,7 +1054,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.5.0"
+version = "1.5.1"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -1692,9 +1681,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.30"
+version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
  "bitflags 2.4.2",
  "errno",

{maturin-1.5.0 → maturin-1.5.1}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
 name = "maturin"
-version = "1.5.0"
+version = "1.5.1"
 description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",
@@ -93,7 +93,7 @@ clap = { version = "4.0.0", features = [
     "wrap_help",
     "unstable-styles",
 ] }
-clap_complete_command = { version = "0.5.1", optional = true }
+clap_complete_command = { version = "0.5.1", default-features = false, features = ["nushell"], optional = true }
 
 # cross compile
 cargo-zigbuild = { version = "0.18.3", default-features = false, optional = true }

{maturin-1.5.0 → maturin-1.5.1}/Changelog.md

@@ -1,8 +1,15 @@
 # Changelog
 
+## [Unreleased]
+
+## [1.5.1] - 2024-03-21
+
+* Fix usage of `--compatibility` when run as a PEP517 backend in [#1992](https://github.com/PyO3/maturin/pull/1992)
+* Fix upload returning malformed summary error in [#2002](https://github.com/PyO3/maturin/pull/2002)
+
 ## [1.5.0] - 2024-03-05
 
-* Bump metadata version from 2.1 to 2.3 in [#1960](https://github.com/PyO3/maturin/pull/1960). Source distributions created by maturin now have reliable metadata, meaning tool such as pip, uv and poetry could skip building them for version resolution.
+* Bump metadata version from 2.1 to 2.3 in [#1965](https://github.com/PyO3/maturin/pull/1965). Source distributions created by maturin now have reliable metadata, meaning tool such as pip, uv and poetry could skip building them for version resolution.
 * Allow identical `VIRTUAL_ENV` and `CONDA_PREFIX` env vars in [#1879](https://github.com/PyO3/maturin/pull/1879)
 * Reject `-i python` when cross compiling in [#1891](https://github.com/PyO3/maturin/pull/1891)
 * Support uniffi-bindgen in cargo workspaces in [#1909](https://github.com/PyO3/maturin/pull/1909)
@@ -946,7 +953,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.5.0...HEAD
+[Unreleased]: https://github.com/pyo3/maturin/compare/v1.5.1...HEAD
+[1.5.1]: https://github.com/pyo3/maturin/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/pyo3/maturin/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/pyo3/maturin/compare/v1.3.2...v1.4.0
 [1.3.2]: https://github.com/pyo3/maturin/compare/v1.3.1...v1.3.2

{maturin-1.5.0 → maturin-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maturin
-Version: 1.5.0
+Version: 1.5.1
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
@@ -279,7 +279,7 @@ The Rust compiler since version 1.64 [requires at least glibc 2.17](https://blog
 For publishing, we recommend enforcing the same manylinux version as the image with the manylinux flag, e.g. use `--manylinux 2014` if you are building in `quay.io/pypa/manylinux2014_x86_64`.
 The [PyO3/maturin-action](https://github.com/PyO3/maturin-action) github action already takes care of this if you set e.g. `manylinux: 2014`.
 
-maturin contains a reimplementation of auditwheel automatically checks the generated library and gives the wheel the proper.
+maturin contains a reimplementation of auditwheel automatically checks the generated library and gives the wheel the proper platform tag.
 If your system's glibc is too new or you link other shared libraries, it will assign the `linux` tag.
 You can also manually disable those checks and directly use native linux target with `--manylinux off`.
 

{maturin-1.5.0 → maturin-1.5.1}/README.md

@@ -254,7 +254,7 @@ The Rust compiler since version 1.64 [requires at least glibc 2.17](https://blog
 For publishing, we recommend enforcing the same manylinux version as the image with the manylinux flag, e.g. use `--manylinux 2014` if you are building in `quay.io/pypa/manylinux2014_x86_64`.
 The [PyO3/maturin-action](https://github.com/PyO3/maturin-action) github action already takes care of this if you set e.g. `manylinux: 2014`.
 
-maturin contains a reimplementation of auditwheel automatically checks the generated library and gives the wheel the proper.
+maturin contains a reimplementation of auditwheel automatically checks the generated library and gives the wheel the proper platform tag.
 If your system's glibc is too new or you link other shared libraries, it will assign the `linux` tag.
 You can also manually disable those checks and directly use native linux target with `--manylinux off`.
 

{maturin-1.5.0 → maturin-1.5.1}/maturin/__init__.py

@@ -8,6 +8,7 @@ On windows, apparently pip's subprocess handling sets stdout to some windows enc
 even though the terminal supports utf8. Writing directly to the binary stdout buffer avoids encoding errors due to
 maturin's emojis.
 """
+
 from __future__ import annotations
 
 import os
@@ -62,22 +63,26 @@ def _build_wheel(
 ) -> str:
     # PEP 517 specifies that only `sys.executable` points to the correct
     # python interpreter
-    command = [
+    base_command = [
         "maturin",
         "pep517",
         "build-wheel",
         "-i",
         sys.executable,
-        "--compatibility",
-        "off",
     ]
-    command.extend(_additional_pep517_args())
+    options = _additional_pep517_args()
     if editable:
-        command.append("--editable")
+        options.append("--editable")
 
     pep517_args = get_maturin_pep517_args(config_settings)
     if pep517_args:
-        command.extend(pep517_args)
+        options.extend(pep517_args)
+
+    if "--compatibility" not in options and "--manylinux" not in options:
+        # default to off if not otherwise specified
+        options = ["--compatibility", "off", *options]
+
+    command = [*base_command, *options]
 
     print("Running `{}`".format(" ".join(command)))
     sys.stdout.flush()

{maturin-1.5.0 → maturin-1.5.1}/src/ci.rs

@@ -61,6 +61,11 @@ impl fmt::Display for Platform {
     }
 }
 
+struct MatrixPlatform {
+    runner: String,
+    target: String,
+}
+
 /// Generate CI configuration
 #[derive(Debug, Parser)]
 pub struct GenerateCI {
@@ -211,28 +216,56 @@ jobs:\n",
                 continue;
             }
             let plat_name = platform.to_string();
-            let os_name = match platform {
-                Platform::Linux | Platform::Emscripten => "ubuntu",
-                _ => &plat_name,
-            };
-            needs.push(platform.to_string());
+            needs.push(plat_name.clone());
             conf.push_str(&format!(
                 "  {plat_name}:
-    runs-on: {os_name}-latest\n"
+    runs-on: ${{{{ matrix.platform.runner }}}}\n"
             ));
             // target matrix
-            let targets = match platform {
-                Platform::Linux => vec!["x86_64", "x86", "aarch64", "armv7", "s390x", "ppc64le"],
-                Platform::Windows => vec!["x64", "x86"],
-                Platform::Macos => vec!["x86_64", "aarch64"],
+            let targets: Vec<_> = match platform {
+                Platform::Linux => ["x86_64", "x86", "aarch64", "armv7", "s390x", "ppc64le"]
+                    .into_iter()
+                    .map(|target| MatrixPlatform {
+                        runner: "ubuntu-latest".to_string(),
+                        target: target.to_string(),
+                    })
+                    .collect(),
+                Platform::Windows => ["x64", "x86"]
+                    .into_iter()
+                    .map(|target| MatrixPlatform {
+                        runner: "windows-latest".to_string(),
+                        target: target.to_string(),
+                    })
+                    .collect(),
+                Platform::Macos => {
+                    vec![
+                        MatrixPlatform {
+                            runner: "macos-latest".to_string(),
+                            target: "x86_64".to_string(),
+                        },
+                        MatrixPlatform {
+                            runner: "macos-14".to_string(),
+                            target: "aarch64".to_string(),
+                        },
+                    ]
+                }
+                Platform::Emscripten => vec![MatrixPlatform {
+                    runner: "ubuntu-latest".to_string(),
+                    target: "wasm32-unknown-emscripten".to_string(),
+                }],
                 _ => Vec::new(),
             };
             if !targets.is_empty() {
-                conf.push_str(&format!(
+                conf.push_str(
                     "    strategy:
       matrix:
-        target: [{targets}]\n",
-                    targets = targets.join(", ")
+        platform:\n",
+                );
+            }
+            for target in targets {
+                conf.push_str(&format!(
+                    "          - runner: {}\n            target: {}\n",
+                    target.runner, target.target
                 ));
             }
             // job steps
@@ -276,7 +309,7 @@ jobs:\n",
           python-version: '3.10'\n",
                     );
                     if matches!(platform, Platform::Windows) {
-                        conf.push_str("          architecture: ${{ matrix.target }}\n");
+                        conf.push_str("          architecture: ${{ matrix.platform.target }}\n");
                     }
                 }
             }
@@ -303,16 +336,11 @@ jobs:\n",
             } else {
                 format!(" {}", maturin_args.join(" "))
             };
-            let maturin_target = if matches!(platform, Platform::Emscripten) {
-                "wasm32-unknown-emscripten"
-            } else {
-                "${{ matrix.target }}"
-            };
             conf.push_str(&format!(
                 "      - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          target: {maturin_target}
+          target: ${{{{ matrix.platform.target }}}}
           args: --release --out dist{maturin_args}
           sccache: 'true'
 "
@@ -326,7 +354,7 @@ jobs:\n",
             let artifact_name = if matches!(platform, Platform::Emscripten) {
                 String::from("wasm-wheels")
             } else {
-                format!("wheels-{platform}-${{{{ matrix.target }}}}")
+                format!("wheels-{platform}-${{{{ matrix.platform.target }}}}")
             };
             conf.push_str(&format!(
                 "      - name: Upload wheels
@@ -349,7 +377,7 @@ jobs:\n",
                     // Test on host for x86_64
                     conf.push_str(&format!(
                         "      - name: pytest
-        if: ${{{{ startsWith(matrix.target, 'x86_64') }}}}
+        if: ${{{{ startsWith(matrix.platform.target, 'x86_64') }}}}
         shell: bash
         run: |
           set -e
@@ -361,10 +389,10 @@ jobs:\n",
                     // Test on QEMU for other architectures
                     conf.push_str(&format!(
                         "      - name: pytest
-        if: ${{{{ !startsWith(matrix.target, 'x86') && matrix.target != 'ppc64' }}}}
+        if: ${{{{ !startsWith(matrix.platform.target, 'x86') && matrix.platform.target != 'ppc64' }}}}
         uses: uraimo/run-on-arch-action@v2.5.0
         with:
-          arch: ${{{{ matrix.target }}}}
+          arch: ${{{{ matrix.platform.target }}}}
           distro: ubuntu22.04
           githubToken: ${{{{ github.token }}}}
           install: |
@@ -398,7 +426,7 @@ jobs:\n",
                 } else {
                     conf.push_str(&format!(
                         "      - name: pytest
-        if: ${{{{ !startsWith(matrix.target, 'aarch64') }}}}
+        if: ${{{{ !startsWith(matrix.platform.target, 'aarch64') }}}}
         shell: bash
         run: |
           set -e
@@ -541,10 +569,22 @@ mod tests {
 
             jobs:
               linux:
-                runs-on: ubuntu-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
+                    platform:
+                      - runner: ubuntu-latest
+                        target: x86_64
+                      - runner: ubuntu-latest
+                        target: x86
+                      - runner: ubuntu-latest
+                        target: aarch64
+                      - runner: ubuntu-latest
+                        target: armv7
+                      - runner: ubuntu-latest
+                        target: s390x
+                      - runner: ubuntu-latest
+                        target: ppc64le
                 steps:
                   - uses: actions/checkout@v4
                   - uses: actions/setup-python@v5
@@ -553,44 +593,52 @@ mod tests {
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist --find-interpreter
                       sccache: 'true'
                       manylinux: auto
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-linux-${{ matrix.target }}
+                      name: wheels-linux-${{ matrix.platform.target }}
                       path: dist
 
               windows:
-                runs-on: windows-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x64, x86]
+                    platform:
+                      - runner: windows-latest
+                        target: x64
+                      - runner: windows-latest
+                        target: x86
                 steps:
                   - uses: actions/checkout@v4
                   - uses: actions/setup-python@v5
                     with:
                       python-version: '3.10'
-                      architecture: ${{ matrix.target }}
+                      architecture: ${{ matrix.platform.target }}
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist --find-interpreter
                       sccache: 'true'
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-windows-${{ matrix.target }}
+                      name: wheels-windows-${{ matrix.platform.target }}
                       path: dist
 
               macos:
-                runs-on: macos-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x86_64, aarch64]
+                    platform:
+                      - runner: macos-latest
+                        target: x86_64
+                      - runner: macos-14
+                        target: aarch64
                 steps:
                   - uses: actions/checkout@v4
                   - uses: actions/setup-python@v5
@@ -599,13 +647,13 @@ mod tests {
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist --find-interpreter
                       sccache: 'true'
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-macos-${{ matrix.target }}
+                      name: wheels-macos-${{ matrix.platform.target }}
                       path: dist
 
               sdist:
@@ -667,10 +715,22 @@ mod tests {
 
             jobs:
               linux:
-                runs-on: ubuntu-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
+                    platform:
+                      - runner: ubuntu-latest
+                        target: x86_64
+                      - runner: ubuntu-latest
+                        target: x86
+                      - runner: ubuntu-latest
+                        target: aarch64
+                      - runner: ubuntu-latest
+                        target: armv7
+                      - runner: ubuntu-latest
+                        target: s390x
+                      - runner: ubuntu-latest
+                        target: ppc64le
                 steps:
                   - uses: actions/checkout@v4
                   - uses: actions/setup-python@v5
@@ -679,44 +739,52 @@ mod tests {
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
                       manylinux: auto
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-linux-${{ matrix.target }}
+                      name: wheels-linux-${{ matrix.platform.target }}
                       path: dist
 
               windows:
-                runs-on: windows-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x64, x86]
+                    platform:
+                      - runner: windows-latest
+                        target: x64
+                      - runner: windows-latest
+                        target: x86
                 steps:
                   - uses: actions/checkout@v4
                   - uses: actions/setup-python@v5
                     with:
                       python-version: '3.10'
-                      architecture: ${{ matrix.target }}
+                      architecture: ${{ matrix.platform.target }}
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-windows-${{ matrix.target }}
+                      name: wheels-windows-${{ matrix.platform.target }}
                       path: dist
 
               macos:
-                runs-on: macos-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x86_64, aarch64]
+                    platform:
+                      - runner: macos-latest
+                        target: x86_64
+                      - runner: macos-14
+                        target: aarch64
                 steps:
                   - uses: actions/checkout@v4
                   - uses: actions/setup-python@v5
@@ -725,13 +793,13 @@ mod tests {
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-macos-${{ matrix.target }}
+                      name: wheels-macos-${{ matrix.platform.target }}
                       path: dist
 
               release:
@@ -787,10 +855,22 @@ mod tests {
 
             jobs:
               linux:
-                runs-on: ubuntu-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
+                    platform:
+                      - runner: ubuntu-latest
+                        target: x86_64
+                      - runner: ubuntu-latest
+                        target: x86
+                      - runner: ubuntu-latest
+                        target: aarch64
+                      - runner: ubuntu-latest
+                        target: armv7
+                      - runner: ubuntu-latest
+                        target: s390x
+                      - runner: ubuntu-latest
+                        target: ppc64le
                 steps:
                   - uses: actions/checkout@v4
                   - uses: actions/setup-python@v5
@@ -799,17 +879,17 @@ mod tests {
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist --find-interpreter --zig
                       sccache: 'true'
                       manylinux: auto
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-linux-${{ matrix.target }}
+                      name: wheels-linux-${{ matrix.platform.target }}
                       path: dist
                   - name: pytest
-                    if: ${{ startsWith(matrix.target, 'x86_64') }}
+                    if: ${{ startsWith(matrix.platform.target, 'x86_64') }}
                     shell: bash
                     run: |
                       set -e
@@ -817,10 +897,10 @@ mod tests {
                       pip install pytest
                       pytest
                   - name: pytest
-                    if: ${{ !startsWith(matrix.target, 'x86') && matrix.target != 'ppc64' }}
+                    if: ${{ !startsWith(matrix.platform.target, 'x86') && matrix.platform.target != 'ppc64' }}
                     uses: uraimo/run-on-arch-action@v2.5.0
                     with:
-                      arch: ${{ matrix.target }}
+                      arch: ${{ matrix.platform.target }}
                       distro: ubuntu22.04
                       githubToken: ${{ github.token }}
                       install: |
@@ -833,29 +913,33 @@ mod tests {
                         pytest
 
               windows:
-                runs-on: windows-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x64, x86]
+                    platform:
+                      - runner: windows-latest
+                        target: x64
+                      - runner: windows-latest
+                        target: x86
                 steps:
                   - uses: actions/checkout@v4
                   - uses: actions/setup-python@v5
                     with:
                       python-version: '3.10'
-                      architecture: ${{ matrix.target }}
+                      architecture: ${{ matrix.platform.target }}
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist --find-interpreter
                       sccache: 'true'
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-windows-${{ matrix.target }}
+                      name: wheels-windows-${{ matrix.platform.target }}
                       path: dist
                   - name: pytest
-                    if: ${{ !startsWith(matrix.target, 'aarch64') }}
+                    if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
                     shell: bash
                     run: |
                       set -e
@@ -864,10 +948,14 @@ mod tests {
                       pytest
 
               macos:
-                runs-on: macos-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x86_64, aarch64]
+                    platform:
+                      - runner: macos-latest
+                        target: x86_64
+                      - runner: macos-14
+                        target: aarch64
                 steps:
                   - uses: actions/checkout@v4
                   - uses: actions/setup-python@v5
@@ -876,16 +964,16 @@ mod tests {
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist --find-interpreter
                       sccache: 'true'
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-macos-${{ matrix.target }}
+                      name: wheels-macos-${{ matrix.platform.target }}
                       path: dist
                   - name: pytest
-                    if: ${{ !startsWith(matrix.target, 'aarch64') }}
+                    if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
                     shell: bash
                     run: |
                       set -e
@@ -952,61 +1040,81 @@ mod tests {
 
             jobs:
               linux:
-                runs-on: ubuntu-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
+                    platform:
+                      - runner: ubuntu-latest
+                        target: x86_64
+                      - runner: ubuntu-latest
+                        target: x86
+                      - runner: ubuntu-latest
+                        target: aarch64
+                      - runner: ubuntu-latest
+                        target: armv7
+                      - runner: ubuntu-latest
+                        target: s390x
+                      - runner: ubuntu-latest
+                        target: ppc64le
                 steps:
                   - uses: actions/checkout@v4
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
                       manylinux: auto
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-linux-${{ matrix.target }}
+                      name: wheels-linux-${{ matrix.platform.target }}
                       path: dist
 
               windows:
-                runs-on: windows-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x64, x86]
+                    platform:
+                      - runner: windows-latest
+                        target: x64
+                      - runner: windows-latest
+                        target: x86
                 steps:
                   - uses: actions/checkout@v4
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-windows-${{ matrix.target }}
+                      name: wheels-windows-${{ matrix.platform.target }}
                       path: dist
 
               macos:
-                runs-on: macos-latest
+                runs-on: ${{ matrix.platform.runner }}
                 strategy:
                   matrix:
-                    target: [x86_64, aarch64]
+                    platform:
+                      - runner: macos-latest
+                        target: x86_64
+                      - runner: macos-14
+                        target: aarch64
                 steps:
                   - uses: actions/checkout@v4
                   - name: Build wheels
                     uses: PyO3/maturin-action@v1
                     with:
-                      target: ${{ matrix.target }}
+                      target: ${{ matrix.platform.target }}
                       args: --release --out dist
                       sccache: 'true'
                   - name: Upload wheels
                     uses: actions/upload-artifact@v4
                     with:
-                      name: wheels-macos-${{ matrix.target }}
+                      name: wheels-macos-${{ matrix.platform.target }}
                       path: dist
 
               sdist:

{maturin-1.5.0 → maturin-1.5.1}/src/upload.rs

@@ -449,7 +449,6 @@ pub fn upload(registry: &Registry, wheel_path: &Path) -> Result<(), UploadError>
     add_option("home_page", &metadata.home_page);
     add_option("download_url", &metadata.download_url);
     add_option("requires_python", &metadata.requires_python);
-    add_option("summary", &metadata.summary);
 
     if metadata.requires_python.is_none() {
         // GitLab PyPI repository API implementation requires this metadata field