maturin 1.9.2__tar.gz → 1.9.3__tar.gz

{maturin-1.9.2 → maturin-1.9.3}/.pre-commit-config.yaml

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

{maturin-1.9.2 → maturin-1.9.3}/Cargo.lock

@@ -1436,7 +1436,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.9.2"
+version = "1.9.3"
 dependencies = [
  "anyhow",
  "base64 0.21.7",

{maturin-1.9.2 → maturin-1.9.3}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
 name = "maturin"
-version = "1.9.2"
+version = "1.9.3"
 description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",

{maturin-1.9.2 → maturin-1.9.3}/Changelog.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## [1.9.3]
+
+* Fix adding `project.license-files` to source distributions.
+* Fix relative Readme rewrite of the root crate in source distributions.
+
 ## [1.9.2]
 
 * Fix PEP 639 implementation, use `License-Expression` over `License`.

{maturin-1.9.2 → maturin-1.9.3}/PKG-INFO

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

{maturin-1.9.2 → maturin-1.9.3}/pyproject.toml

@@ -1,7 +1,7 @@
 # Workaround to bootstrap maturin on non-manylinux platforms
 [build-system]
 requires = [
-    "setuptools",
+    "setuptools>=77.0.0",
     "tomli>=1.1.0 ; python_version<'3.11'",
     "setuptools-rust>=1.11.0",
 ]

{maturin-1.9.2 → maturin-1.9.3}/src/source_distribution.rs

@@ -8,7 +8,8 @@ use fs_err as fs;
 use ignore::overrides::Override;
 use normpath::PathExt as _;
 use path_slash::PathExt as _;
-use std::collections::HashMap;
+use pyproject_toml::check_pep639_glob;
+use std::collections::{HashMap, HashSet};
 use std::ffi::OsStr;
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -501,17 +502,8 @@ fn add_cargo_package_files_to_sdist(
         .unwrap()
         .strip_prefix(&sdist_root)
         .unwrap();
-    add_crate_to_source_distribution(
-        writer,
-        manifest_path,
-        root_dir.join(relative_main_crate_manifest_dir),
-        None,
-        &known_path_deps,
-        true,
-        false,
-    )?;
     // Handle possible relative readme field in Cargo.toml
-    if let Some(readme) = main_crate.readme.as_ref() {
+    let readme_path = if let Some(readme) = main_crate.readme.as_ref() {
         let readme = abs_manifest_dir.join(readme);
         let abs_readme = readme
             .normalize()
@@ -530,7 +522,19 @@ fn add_cargo_package_files_to_sdist(
                 .join(readme.file_name().unwrap()),
             &abs_readme,
         )?;
-    }
+        Some(abs_readme)
+    } else {
+        None
+    };
+    add_crate_to_source_distribution(
+        writer,
+        manifest_path,
+        root_dir.join(relative_main_crate_manifest_dir),
+        readme_path.as_deref(),
+        &known_path_deps,
+        true,
+        false,
+    )?;
 
     // Add Cargo.lock file and workspace Cargo.toml
     let manifest_cargo_lock_path = abs_manifest_dir.join("Cargo.lock");
@@ -785,6 +789,34 @@ pub fn source_distribution(
         if let Some(pyproject_toml::License::File { file }) = project.license.as_ref() {
             writer.add_file(root_dir.join(file), pyproject_dir.join(file))?;
         }
+        if let Some(license_files) = &project.license_files {
+            // Safe on Windows and Unix as neither forward nor backwards slashes are escaped.
+            let escaped_pyproject_dir =
+                PathBuf::from(glob::Pattern::escape(pyproject_dir.to_str().unwrap()));
+            let mut seen = HashSet::new();
+            for license_glob in license_files {
+                check_pep639_glob(license_glob)?;
+                for license_path in
+                    glob::glob(&escaped_pyproject_dir.join(license_glob).to_string_lossy())?
+                {
+                    let license_path = license_path?;
+                    if !license_path.is_file() {
+                        continue;
+                    }
+                    let license_path = license_path
+                        .strip_prefix(pyproject_dir)
+                        .expect("matched path starts with glob root")
+                        .to_path_buf();
+                    if seen.insert(license_path.clone()) {
+                        debug!("Including license file `{}`", license_path.display());
+                        writer.add_file(
+                            root_dir.join(&license_path),
+                            pyproject_dir.join(&license_path),
+                        )?;
+                    }
+                }
+            }
+        }
     }
 
     let mut include = |pattern| -> Result<()> {

{maturin-1.9.2 → maturin-1.9.3}/src/target/legacy_py.rs

@@ -57,7 +57,7 @@ pub(super) static IOS_ARCHES: &[&str] = &["arm64", "x86_64"];
 pub(super) static ANDROID_ARCHES: &[&str] = &["armeabi_v7a", "arm64_v8a", "x86", "x86_64"];
 
 pub(super) static MANYLINUX_ARCHES: &[&str] = &[
-    "x86_64", "i686", "aarch64", "armv7l", "ppc64le", "s390x", "ppc64",
+    "x86_64", "i686", "aarch64", "armv7l", "ppc64le", "s390x", "ppc64", "riscv64",
 ];
 
 pub(super) static MUSLLINUX_ARCHES: &[&str] =

{maturin-1.9.2 → maturin-1.9.3}/src/target/pypi_tags.rs

@@ -78,6 +78,7 @@ pub fn is_arch_supported_by_pypi(target: &Target) -> bool {
 /// Validates that a wheel platform tag is allowed by PyPI.
 ///
 /// Based on PyPI warehouse platform tag validation logic.
+///
 fn is_platform_tag_allowed_by_pypi(platform_tag: &str) -> bool {
     // Covers old Windows and old manylinux tags.
     if ALLOWED_PLATFORMS.contains(&platform_tag) {
@@ -170,7 +171,8 @@ mod tests {
             // manylinux platforms
             ("manylinux2014_x86_64", true),
             ("manylinux_2_17_aarch64", true),
-            ("manylinux_2_17_riscv64", false),
+            ("manylinux_2_17_riscv64", true),
+            ("manylinux_2_39_riscv64", true),
             // musllinux platforms
             ("musllinux_1_1_x86_64", true),
             ("musllinux_1_1_riscv64", false),
@@ -222,12 +224,12 @@ mod tests {
             ("x86_64-unknown-linux-gnu", true),
             ("aarch64-linux-android", true),
             ("armv7-linux-androideabi", true),
-            ("riscv64gc-unknown-linux-gnu", false), // Unsupported
-            ("x86_64-unknown-freebsd", false),      // Now unsupported (no lazy validation)
-            ("powerpc64-unknown-linux-gnu", true),  // PPC64 on Linux is supported
-            ("s390x-unknown-linux-gnu", true),      // s390x on Linux is supported
-            ("wasm32-unknown-emscripten", false),   // Emscripten is unsupported
-            ("i686-pc-windows-msvc", true),         // i686 Windows is supported
+            ("riscv64gc-unknown-linux-gnu", true),
+            ("x86_64-unknown-freebsd", false), // Now unsupported (no lazy validation)
+            ("powerpc64-unknown-linux-gnu", true), // PPC64 on Linux is supported
+            ("s390x-unknown-linux-gnu", true), // s390x on Linux is supported
+            ("wasm32-unknown-emscripten", false), // Emscripten is unsupported
+            ("i686-pc-windows-msvc", true),    // i686 Windows is supported
         ];
 
         for (triple, expected) in targets {