Source: python-maturin Version: 1.15.0-1 Severity: important Tags: patch User: [email protected] Usertags: cargo-options-0.8 X-Debbugs-Cc: [email protected]
Dear maintainer, I am preparing a cargo-options transition to 0.8, which will likely be uploaded soon. Since 1.15.0-1 was just uploaded today, I'm happy to delay or go ahead, based on what you'd like to do. python-maturin build-depends on librust-cargo-options-0.7+default-dev and has a patch downgrading it from 0.8.1. I have attached a debdiff fixing this. Best regards, Simon Quigley [email protected]
diff -Nru python-maturin-1.15.0/debian/changelog python-maturin-1.15.0/debian/changelog --- python-maturin-1.15.0/debian/changelog 2026-10-16 02:54:55.000000000 -0500 +++ python-maturin-1.15.0/debian/changelog 2026-10-16 08:35:10.000000000 -0500 @@ -1,3 +1,10 @@ +python-maturin (1.15.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Drop downgrade-cargo-options.patch and allow cargo-options 0.8.1. + + -- Simon Quigley <[email protected]> Fri, 16 Oct 2026 08:35:10 -0500 + python-maturin (1.15.0-1) unstable; urgency=medium * Team upload. diff -Nru python-maturin-1.15.0/debian/control python-maturin-1.15.0/debian/control --- python-maturin-1.15.0/debian/control 2026-10-16 02:54:55.000000000 -0500 +++ python-maturin-1.15.0/debian/control 2026-10-16 08:31:44.000000000 -0500 @@ -14,7 +14,7 @@ librust-cargo-cyclonedx-0.5+default-dev (<< 0.5.10), librust-cargo-cyclonedx-0.5+default-dev (>= 0.5.9), librust-cargo-metadata-0.23+default-dev (>= 0.23.1), - librust-cargo-options-0.7+default-dev (>= 0.7.2), + librust-cargo-options-0.8+default-dev (>= 0.8.1), librust-cbindgen-0.29-dev, librust-cc-1+default-dev (>= 1.0.88), librust-clap-4+default-dev, diff -Nru python-maturin-1.15.0/debian/patches/downgrade-cargo-options.patch python-maturin-1.15.0/debian/patches/downgrade-cargo-options.patch --- python-maturin-1.15.0/debian/patches/downgrade-cargo-options.patch 2026-10-16 02:54:55.000000000 -0500 +++ python-maturin-1.15.0/debian/patches/downgrade-cargo-options.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,97 +0,0 @@ -From: Colin Watson <[email protected]> -Date: Thu, 15 Oct 2026 10:54:13 +0100 -Subject: Downgrade cargo-options - -This essentially reverts -https://github.com/PyO3/maturin/commit/4a1b63ce4db30101ae6047e2e12d7a26c38db4f5. - -Last-Update: 2026-10-15 ---- - Cargo.toml | 2 +- - src/cargo_options.rs | 12 +++++++++--- - tests/cmd/build.stdout | 4 ++-- - tests/cmd/develop.stdout | 4 ++-- - tests/cmd/publish.stdout | 4 ++-- - 5 files changed, 16 insertions(+), 10 deletions(-) - -diff --git a/Cargo.toml b/Cargo.toml -index c16a053..b8d6f4b 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -44,7 +44,7 @@ base64 = "0.22.0" - glob = "0.3.0" - cargo-config2 = "0.1.24" - cargo_metadata = "0.23.1" --cargo-options = "0.8.1" -+cargo-options = "0.7.2" - cbindgen = { version = "0.29.0", default-features = false } - flate2 = "1.0.18" - goblin = "0.10.0" -diff --git a/src/cargo_options.rs b/src/cargo_options.rs -index 29774d2..540e6d6 100644 ---- a/src/cargo_options.rs -+++ b/src/cargo_options.rs -@@ -112,9 +112,15 @@ pub struct CargoOptions { - #[arg(short = 'Z', value_name = "FLAG", action = clap::ArgAction::Append)] - pub unstable_flags: Vec<String>, - -- /// Output a build timing report at the end of the build -- #[arg(long, help_heading = heading::COMPILATION_OPTIONS)] -- pub timings: bool, -+ /// Timing output formats (unstable) (comma separated): html, json -+ #[arg( -+ long, -+ value_name = "FMTS", -+ value_delimiter = ',', -+ require_equals = true, -+ help_heading = heading::COMPILATION_OPTIONS, -+ )] -+ pub timings: Option<Vec<String>>, - - /// Outputs a future incompatibility report at the end of the build (unstable) - #[arg(long)] -diff --git a/tests/cmd/build.stdout b/tests/cmd/build.stdout -index 0f4e8b7..6f8c136 100644 ---- a/tests/cmd/build.stdout -+++ b/tests/cmd/build.stdout -@@ -152,8 +152,8 @@ Compilation Options: - --target-dir <DIRECTORY> - Directory for all generated artifacts - -- --timings -- Output a build timing report at the end of the build -+ --timings=<FMTS> -+ Timing output formats (unstable) (comma separated): html, json - - Feature Selection: - -F, --features <FEATURES> -diff --git a/tests/cmd/develop.stdout b/tests/cmd/develop.stdout -index a191868..df120a2 100644 ---- a/tests/cmd/develop.stdout -+++ b/tests/cmd/develop.stdout -@@ -115,8 +115,8 @@ Compilation Options: - --target-dir <DIRECTORY> - Directory for all generated artifacts - -- --timings -- Output a build timing report at the end of the build -+ --timings=<FMTS> -+ Timing output formats (unstable) (comma separated): html, json - - Feature Selection: - -F, --features <FEATURES> -diff --git a/tests/cmd/publish.stdout b/tests/cmd/publish.stdout -index e49365d..b8a0f95 100644 ---- a/tests/cmd/publish.stdout -+++ b/tests/cmd/publish.stdout -@@ -187,8 +187,8 @@ Compilation Options: - --target-dir <DIRECTORY> - Directory for all generated artifacts - -- --timings -- Output a build timing report at the end of the build -+ --timings=<FMTS> -+ Timing output formats (unstable) (comma separated): html, json - - Feature Selection: - -F, --features <FEATURES> diff -Nru python-maturin-1.15.0/debian/patches/series python-maturin-1.15.0/debian/patches/series --- python-maturin-1.15.0/debian/patches/series 2026-10-16 02:54:55.000000000 -0500 +++ python-maturin-1.15.0/debian/patches/series 2026-10-16 08:31:11.000000000 -0500 @@ -4,7 +4,6 @@ drop-zig-feature.patch drop-auditwheel-feature.patch drop-keyring-apple-windows.patch -downgrade-cargo-options.patch relax-console.patch relax-dialoguer.patch relax-pyo3-introspection.patch
OpenPGP_signature.asc
Description: OpenPGP digital signature
