maturin 1.7.0__tar.gz → 1.7.1__tar.gz

{maturin-1.7.0 → maturin-1.7.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.5.0
+    rev: v0.6.1
     hooks:
       - id: ruff-format
       - id: ruff
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.1
+    rev: v1.11.1
     hooks:
       - id: mypy
         entry: mypy maturin/

{maturin-1.7.0 → maturin-1.7.1}/Cargo.lock

@@ -336,9 +336,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.104"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
+checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
 
 [[package]]
 name = "cfb"
@@ -411,9 +411,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete_command"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d"
+checksum = "da8e198c052315686d36371e8a3c5778b7852fc75cc313e4e11eeb7a644a1b62"
 dependencies = [
  "clap",
  "clap_complete",
@@ -422,9 +422,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete_nushell"
-version = "0.1.11"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e"
+checksum = "1accf1b463dee0d3ab2be72591dccdab8bef314958340447c882c4c72acfe2a3"
 dependencies = [
  "clap",
  "clap_complete",
@@ -1216,7 +1216,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.7.0"
+version = "1.7.1"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -1463,9 +1463,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.5.0",
  "cfg-if",
@@ -1495,9 +1495,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",
@@ -1564,9 +1564,9 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
 
 [[package]]
 name = "pep440_rs"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15efd4d885c29126cc93e12af3087896e2518bd5ca0fb328c19c4ef9cecfa8be"
+checksum = "ca0a570e7ec9171250cac57614e901f62408094b54b3798bb920d3cf0d4a0e09"
 dependencies = [
  "once_cell",
  "serde",
@@ -1577,9 +1577,9 @@ dependencies = [
 
 [[package]]
 name = "pep508_rs"
-version = "0.4.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1455babf8edd3eedcdfcb39700e455a4bb189e71b4f1fa0eacc9b244cc5a55e6"
+checksum = "581c27e97a3f38c5d691962af7da93c2672b5227d59cf165b87a9b1fd53dd724"
 dependencies = [
  "derivative",
  "once_cell",
@@ -1690,9 +1690,9 @@ dependencies = [
 
 [[package]]
 name = "pyproject-toml"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b80f889b6d413c3f8963a2c7db03f95dd6e1d85e1074137cb2013ea2faa8898"
+checksum = "ef7061023bcb58a0fc4a4bbe9819c13b0dca7c2abc14da14f5ecc1532ab3a36a"
 dependencies = [
  "indexmap 2.2.6",
  "pep440_rs",
@@ -2318,9 +2318,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
 
 [[package]]
 name = "tempfile"

{maturin-1.7.0 → maturin-1.7.1}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
 name = "maturin"
-version = "1.7.0"
+version = "1.7.1"
 description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",
@@ -70,7 +70,7 @@ rustc_version = "0.4.0"
 semver = "1.0.22"
 target-lexicon = "0.12.14"
 indexmap = "2.2.3"
-pyproject-toml = "0.10.0"
+pyproject-toml = "0.11.0"
 python-pkginfo = "0.6.0"
 textwrap = "0.16.1"
 ignore = "0.4.20"
@@ -80,8 +80,8 @@ cc = "1.0.88"
 dunce = "1.0.2"
 normpath = "1.1.1"
 path-slash = "0.2.1"
-pep440_rs = { version = "0.5.0", features = ["serde", "tracing"] }
-pep508_rs = { version = "0.4.2", features = ["serde", "tracing"] }
+pep440_rs = { version = "0.6.0", features = ["serde", "tracing"] }
+pep508_rs = { version = "0.6.0", features = ["serde", "tracing"] }
 same-file = "1.0.6"
 time = "0.3.17"
 url = "2.5.0"
@@ -94,7 +94,7 @@ clap = { version = "4.0.0", features = [
     "wrap_help",
     "unstable-styles",
 ] }
-clap_complete_command = { version = "0.5.1", default-features = false, features = ["nushell"], optional = true }
+clap_complete_command = { version = "0.6.1", optional = true }
 
 # cross compile
 cargo-zigbuild = { version = "0.18.4", default-features = false, optional = true }

{maturin-1.7.0 → maturin-1.7.1}/Changelog.md

@@ -1,6 +1,9 @@
 # Changelog
 
-## [Unreleased]
+## [1.7.1]
+
+* Forward `cargo package --list` warnings in [#2186](https://github.com/PyO3/maturin/pull/2186)
+* In source distributions, we move the readmes of path dependencies into the respective crate to avoid collision between different readmes in [#2184](https://github.com/PyO3/maturin/pull/2184)
 
 ## [1.7.0] - 2024-07-07
 
@@ -826,7 +829,7 @@ With this release, the name of this project changes from _pyo3-pack_ to _maturin
 
 ### Changed
 
- * The `--skip-auditwheel` flag has been deprecated in favor of `--manxlinux=[1|1-unchecked|2010|2010-unchecked|off]`.
+ * The `--skip-auditwheel` flag has been deprecated in favor of `--manylinux=[1|1-unchecked|2010|2010-unchecked|off]`.
  * Switched to rustls. This means the upload feature can be used from the docker container and builds of maturin itself are manylinux compliant when compiled with the musl target.
 
 ## [0.4.2] - 2018-12-15

{maturin-1.7.0 → maturin-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maturin
-Version: 1.7.0
+Version: 1.7.1
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
@@ -14,10 +14,10 @@ Summary: Build and publish crates with pyo3, cffi and uniffi bindings as well as
 Keywords: python,cffi,packaging,pypi,pyo3
 Home-Page: https://github.com/pyo3/maturin
 Author: konstin <konstin@mailbox.org>, messense <messense@icloud.com>
-Author-email: konstin <konstin@mailbox.org>, messense <messense@icloud.com>
+Author-email: konstin <konstin@mailbox.org>
 License: MIT OR Apache-2.0
 Requires-Python: >=3.7
-Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
+Description-Content-Type: text/markdown
 Project-URL: Source Code, https://github.com/PyO3/maturin
 Project-URL: Issues, https://github.com/PyO3/maturin/issues
 Project-URL: Documentation, https://maturin.rs

{maturin-1.7.0 → maturin-1.7.1}/maturin.schema.json

@@ -11,6 +11,17 @@
         "null"
       ]
     },
+    "auditwheel": {
+      "description": "Audit wheel mode",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/AuditWheelMode"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
     "bindings": {
       "description": "Bindings type",
       "type": [
@@ -194,6 +205,32 @@
     }
   },
   "definitions": {
+    "AuditWheelMode": {
+      "description": "Auditwheel mode",
+      "oneOf": [
+        {
+          "description": "Audit and repair wheel for manylinux compliance",
+          "type": "string",
+          "enum": [
+            "repair"
+          ]
+        },
+        {
+          "description": "Check wheel for manylinux compliance, but do not repair",
+          "type": "string",
+          "enum": [
+            "check"
+          ]
+        },
+        {
+          "description": "Don't check for manylinux compliance",
+          "type": "string",
+          "enum": [
+            "skip"
+          ]
+        }
+      ]
+    },
     "CargoTarget": {
       "description": "Cargo compile target",
       "type": "object",

{maturin-1.7.0 → maturin-1.7.1}/pyproject.toml

@@ -5,7 +5,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maturin"
+description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
+authors = [{ name = "konstin", email = "konstin@mailbox.org" }]
+readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.7"
+license = {text = "MIT OR Apache-2.0"}
 classifiers = [
     "Topic :: Software Development :: Build Tools",
     "Programming Language :: Rust",
@@ -14,10 +18,6 @@ classifiers = [
 ]
 dependencies = ["tomli>=1.1.0 ; python_version<'3.11'"]
 dynamic = [
-    "authors",
-    "description",
-    "license",
-    "readme",
     "version"
 ]
 
@@ -35,6 +35,9 @@ Issues = "https://github.com/PyO3/maturin/issues"
 Documentation = "https://maturin.rs"
 Changelog = "https://maturin.rs/changelog.html"
 
+[tool.setuptools]
+packages = ["maturin"]
+
 [tool.maturin]
 bindings = "bin"
 

{maturin-1.7.0 → maturin-1.7.1}/setup.py

@@ -38,9 +38,6 @@ try:
 except ImportError:
     bdist_wheel = None
 
-with open("README.md", encoding="utf-8", errors="ignore") as fp:
-    long_description = fp.read()
-
 with open("Cargo.toml", "rb") as fp:
     version = tomllib.load(fp)["package"]["version"]
 
@@ -51,27 +48,8 @@ if os.getenv("MATURIN_SETUP_ARGS"):
     cargo_args = shlex.split(os.getenv("MATURIN_SETUP_ARGS", ""))
 
 setup(
-    name="maturin",
-    author="konstin",
-    author_email="konstin@mailbox.org",
-    url="https://github.com/pyo3/maturin",
-    description="Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as "
-    "python packages",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
     version=version,
-    license="MIT OR Apache-2.0",
-    python_requires=">=3.7",
     cmdclass={"bdist_wheel": bdist_wheel},
-    packages=["maturin"],
     rust_extensions=[RustBin("maturin", args=cargo_args, cargo_manifest_args=["--locked"])],
-    classifiers=[
-        "Topic :: Software Development :: Build Tools",
-        "Programming Language :: Rust",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy",
-    ],
-    install_requires=["tomli>=1.1.0 ; python_version<'3.11'"],
-    setup_requires=["setuptools-rust>=1.4.0"],
     zip_safe=False,
 )

{maturin-1.7.0 → maturin-1.7.1}/src/auditwheel/audit.rs

@@ -9,10 +9,11 @@ use goblin::elf::{sym::STT_FUNC, Elf};
 use lddtree::Library;
 use once_cell::sync::Lazy;
 use regex::Regex;
+use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, HashSet};
-use std::io;
 use std::io::Read;
 use std::path::{Path, PathBuf};
+use std::{fmt, io};
 use thiserror::Error;
 
 static IS_LIBPYTHON: Lazy<Regex> =
@@ -54,13 +55,37 @@ pub enum AuditWheelError {
     #[error("Your library is not {0} compliant because it has unsupported architecture: {1}")]
     UnsupportedArchitecture(Policy, String),
     /// This platform tag isn't defined by auditwheel yet
-    #[error("{0} compatibility policy is not defined by auditwheel yet, pass `--skip-auditwheel` to proceed anyway")]
+    #[error("{0} compatibility policy is not defined by auditwheel yet, pass `--auditwheel=skip` to proceed anyway")]
     UndefinedPolicy(String),
     /// Failed to analyze external shared library dependencies of the wheel
     #[error("Failed to analyze external shared library dependencies of the wheel")]
     DependencyAnalysisError(#[source] lddtree::Error),
 }
 
+/// Auditwheel mode
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize, clap::ValueEnum)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[serde(rename_all = "lowercase")]
+pub enum AuditWheelMode {
+    /// Audit and repair wheel for manylinux compliance
+    #[default]
+    Repair,
+    /// Check wheel for manylinux compliance, but do not repair
+    Check,
+    /// Don't check for manylinux compliance
+    Skip,
+}
+
+impl fmt::Display for AuditWheelMode {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            AuditWheelMode::Repair => write!(f, "repair"),
+            AuditWheelMode::Check => write!(f, "check"),
+            AuditWheelMode::Skip => write!(f, "skip"),
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct VersionedLibrary {
     /// library name