public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/maturin] epel10.3: Update to version 1.15.0; Fixes RHBZ#2522075
@ 2026-09-14  8:58 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-09-14  8:58 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/maturin
Branch : epel10.3
Commit : dc3dc8bc4af762ebd9d6d82da3c503dad16d1b97
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-09-14T06:47:10+01:00
Stats  : +17/-147 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/maturin/c/dc3dc8bc4af762ebd9d6d82da3c503dad16d1b97?branch=epel10.3

Log:
Update to version 1.15.0; Fixes RHBZ#2522075

---
diff --git a/0001-drop-unavailable-features.patch b/0001-drop-unavailable-features.patch
index 17404c6..da9521b 100644
--- a/0001-drop-unavailable-features.patch
+++ b/0001-drop-unavailable-features.patch
@@ -1,14 +1,14 @@
-From ebe9330b089a50da2b2cbf65ef01c2123d166395 Mon Sep 17 00:00:00 2001
+From ab8603d6f46a51456da8cb83325c940b6a9c2f9b Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Tue, 23 Sep 2025 22:46:35 +0200
 Subject: [PATCH 1/3] drop unavailable features
 
 ---
- Cargo.toml | 75 ++----------------------------------------------------
- 1 file changed, 2 insertions(+), 73 deletions(-)
+ Cargo.toml | 76 ++----------------------------------------------------
+ 1 file changed, 2 insertions(+), 74 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 53267721..80a2b099 100644
+index b1448811..d841877f 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -100,11 +100,6 @@ clap = { version = "4.0.0", features = [
@@ -16,8 +16,8 @@ index 53267721..80a2b099 100644
  clap_complete_command = { version = "0.6.1", optional = true }
  
 -# cross compile
--cargo-zigbuild = { version = "0.23.0", default-features = false, optional = true }
--cargo-xwin = { version = "0.23.0", default-features = false, optional = true }
+-cargo-zigbuild = { version = "0.23.1", default-features = false, optional = true }
+-cargo-xwin = { version = "0.23.1", default-features = false, optional = true }
 -xz2 = { version = "0.1", optional = true }
 -
  # log
@@ -64,7 +64,7 @@ index 53267721..80a2b099 100644
  [dev-dependencies]
  expect-test = "1.4.1"
  fs4 = { version = "0.13.1", features = ["fs-err3"] }
-@@ -168,54 +136,19 @@ trycmd = "1.2.0"
+@@ -168,55 +136,19 @@ trycmd = "1.2.0"
  which = "8.0.0"
  
  [features]
@@ -91,7 +91,8 @@ index 53267721..80a2b099 100644
  
  sbom = ["dep:cargo-cyclonedx", "dep:which"]
  
--# keyring doesn't support *BSD so it's not enabled in `full` by default
+-# we only enable keyring's native macOS/Windows/Linux backends (no BSD backend),
+-# so it's not enabled in `full` by default
 -password-storage = ["upload", "keyring"]
 -
 -rustls = [
@@ -121,7 +122,7 @@ index 53267721..80a2b099 100644
  # Internal feature to speed up the tests significantly
  faster-tests = []
  
-@@ -223,10 +156,6 @@ faster-tests = []
+@@ -224,10 +156,6 @@ faster-tests = []
  human-panic = []
  log = []
  

diff --git a/0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch b/0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch
index d5f74ec..c23ffc5 100644
--- a/0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch
+++ b/0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch
@@ -1,4 +1,4 @@
-From 2583e12639914bd443e734de21e4079d82028077 Mon Sep 17 00:00:00 2001
+From a80803c75a3469a033df021dbd80f0767ee32bd9 Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Mon, 19 May 2025 21:57:43 +0200
 Subject: [PATCH 2/3] drop incompatible cargo flags from setuptools_rust
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] drop incompatible cargo flags from setuptools_rust
  1 file changed, 1 insertion(+), 17 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 5d9fd285..5c56178f 100644
+index a3a3eaa6..5fedb583 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -11,7 +11,6 @@
@@ -19,7 +19,7 @@ index 5d9fd285..5c56178f 100644
  
  try:
      import tomllib
-@@ -42,24 +41,9 @@ except ImportError:
+@@ -41,24 +40,9 @@ except ImportError:
  with open("Cargo.toml", "rb") as fp:
      version = tomllib.load(fp)["package"]["version"]
  

diff --git a/0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch b/0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch
index be0a8c6..538ef1d 100644
--- a/0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch
+++ b/0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch
@@ -1,4 +1,4 @@
-From f219473474ec8ffc9f82fc3ec4799d16575ad75d Mon Sep 17 00:00:00 2001
+From f87bfb75a8d1c10a0876c04bf4570882095d12fe Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Tue, 23 Sep 2025 22:47:53 +0200
 Subject: [PATCH 3/3] revert to using setuptools for non-maturin bootstrap

diff --git a/3258.patch b/3258.patch
deleted file mode 100644
index 6c8d17c..0000000
--- a/3258.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 78dfb8f76293ea6c6774b306afda3f878db0e827 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Sat, 11 Jul 2026 08:09:28 +0100
-Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20specify=20generate-import-lib?=
- =?UTF-8?q?=20for=20PyO3=200.29?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since the `generate-import-lib` feature is deprecated in PyO3 0.29 and
-no longer has any effect, https://github.com/PyO3/pyo3/pull/5866, this
-commit stops asking for it in test crates.
----
- test-crates/pyo3-abi3-and-abi3t/Cargo.toml                      | 2 --
- test-crates/pyo3-abi3t/Cargo.toml                               | 1 -
- test-crates/pyo3-mixed-include-exclude/Cargo.toml               | 2 +-
- test-crates/pyo3-mixed-src/rust/Cargo.toml                      | 2 +-
- .../rust/python/pyo3-mixed-workspace-py/Cargo.toml              | 2 +-
- test-crates/pyo3-mixed/Cargo.toml                               | 2 +-
- test-crates/pyo3-pure/Cargo.toml                                | 1 -
- tests/run/sdist.rs                                              | 1 -
- 8 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/test-crates/pyo3-abi3-and-abi3t/Cargo.toml b/test-crates/pyo3-abi3-and-abi3t/Cargo.toml
-index 67850096d..4984e8aed 100644
---- a/test-crates/pyo3-abi3-and-abi3t/Cargo.toml
-+++ b/test-crates/pyo3-abi3-and-abi3t/Cargo.toml
-@@ -13,12 +13,10 @@ default = ["abi3-and-abi3t-py315"]
- abi3-and-abi3t-py315 = [
-     "pyo3/abi3-py38",
-     "pyo3/abi3t-py315",
--    "pyo3/generate-import-lib",
- ]
- abi3-and-current-abi3t = [
-     "pyo3/abi3-py38",
-     "pyo3/abi3t",
--    "pyo3/generate-import-lib",
- ]
- 
- [lib]
-diff --git a/test-crates/pyo3-abi3t/Cargo.toml b/test-crates/pyo3-abi3t/Cargo.toml
-index e0963f727..7bf679c6a 100644
---- a/test-crates/pyo3-abi3t/Cargo.toml
-+++ b/test-crates/pyo3-abi3t/Cargo.toml
-@@ -8,7 +8,6 @@ license = "MIT"
- [dependencies]
- pyo3 = { version = "0.29.0", features = [
-     "abi3t-py315",
--    "generate-import-lib",
- ] }
- 
- [lib]
-diff --git a/test-crates/pyo3-mixed-include-exclude/Cargo.toml b/test-crates/pyo3-mixed-include-exclude/Cargo.toml
-index 5379fc5a9..5027603e1 100644
---- a/test-crates/pyo3-mixed-include-exclude/Cargo.toml
-+++ b/test-crates/pyo3-mixed-include-exclude/Cargo.toml
-@@ -6,7 +6,7 @@ description = "Implements a dummy function combining rust and python"
- edition = "2021"
- 
- [dependencies]
--pyo3 = { version = "0.29.0", features = ["generate-import-lib"] }
-+pyo3 = { version = "0.29.0" }
- 
- [lib]
- name = "pyo3_mixed_include_exclude"
-diff --git a/test-crates/pyo3-mixed-src/rust/Cargo.toml b/test-crates/pyo3-mixed-src/rust/Cargo.toml
-index 3dd63e936..70ab4c502 100644
---- a/test-crates/pyo3-mixed-src/rust/Cargo.toml
-+++ b/test-crates/pyo3-mixed-src/rust/Cargo.toml
-@@ -6,7 +6,7 @@ description = "Implements a dummy function combining rust and python"
- edition = "2021"
- 
- [dependencies]
--pyo3 = { version = "0.29.0", features = ["generate-import-lib"] }
-+pyo3 = { version = "0.29.0" }
- 
- [lib]
- name = "pyo3_mixed_src"
-diff --git a/test-crates/pyo3-mixed-workspace/rust/python/pyo3-mixed-workspace-py/Cargo.toml b/test-crates/pyo3-mixed-workspace/rust/python/pyo3-mixed-workspace-py/Cargo.toml
-index cc6ecdae1..a19bd7e3a 100644
---- a/test-crates/pyo3-mixed-workspace/rust/python/pyo3-mixed-workspace-py/Cargo.toml
-+++ b/test-crates/pyo3-mixed-workspace/rust/python/pyo3-mixed-workspace-py/Cargo.toml
-@@ -7,7 +7,7 @@ edition = "2021"
- 
- [dependencies]
- pyo3-mixed-workspace = { path = "../../pyo3-mixed-workspace" }
--pyo3 = { version = "0.29.0", features = ["generate-import-lib", ] }
-+pyo3 = { version = "0.29.0" }
- 
- [lib]
- name = "pyo3_mixed_workspace_py"
-diff --git a/test-crates/pyo3-mixed/Cargo.toml b/test-crates/pyo3-mixed/Cargo.toml
-index 30146ed97..b83103943 100644
---- a/test-crates/pyo3-mixed/Cargo.toml
-+++ b/test-crates/pyo3-mixed/Cargo.toml
-@@ -6,7 +6,7 @@ description = "Implements a dummy function combining rust and python"
- edition = "2021"
- 
- [dependencies]
--pyo3 = { version = "0.29.0", features = ["generate-import-lib"] }
-+pyo3 = { version = "0.29.0" }
- 
- [lib]
- name = "pyo3_mixed"
-diff --git a/test-crates/pyo3-pure/Cargo.toml b/test-crates/pyo3-pure/Cargo.toml
-index b2240d582..77c49d381 100644
---- a/test-crates/pyo3-pure/Cargo.toml
-+++ b/test-crates/pyo3-pure/Cargo.toml
-@@ -9,7 +9,6 @@ license = "MIT"
- [dependencies]
- pyo3 = { version = "0.29.0", features = [
-     "abi3-py39",
--    "generate-import-lib",
- ] }
- 
- [lib]
-diff --git a/tests/run/sdist.rs b/tests/run/sdist.rs
-index 2bbd54934..e945440f4 100644
---- a/tests/run/sdist.rs
-+++ b/tests/run/sdist.rs
-@@ -488,7 +488,6 @@ fn workspace_members_non_local_dep_sdist() {
-         [dependencies]
-         pyo3 = { version = "0.29.0", features = [
-             "abi3-py39",
--            "generate-import-lib",
-         ] }
- 
-         [lib]

diff --git a/maturin.spec b/maturin.spec
index e964687..5f0d788 100644
--- a/maturin.spec
+++ b/maturin.spec
@@ -4,7 +4,7 @@
 %bcond patchelf %[ %{undefined rhel} || %{defined epel} ]
 
 Name:           maturin
-Version:        1.14.1
+Version:        1.15.0
 Release:        %autorelease
 Summary:        Build and publish Rust crates as Python packages
 SourceLicense:  MIT OR Apache-2.0
@@ -100,10 +100,6 @@ Patch:          0002-drop-incompatible-cargo-flags-from-setuptools_rust.patch
 # * revert to building maturin with setuptools instead of bootstrapping maturin
 Patch:          0003-revert-to-using-setuptools-for-non-maturin-bootstrap.patch
 
-# Don’t specify generate-import-lib for PyO3 0.29
-# https://github.com/PyO3/maturin/pull/3258
-Patch:          %{url}/pull/3258.patch
-
 BuildRequires:  cargo-rpm-macros >= 24
 %if %{with patchelf}
 BuildRequires:  tomcli
@@ -232,6 +228,7 @@ skip="${skip-} --skip=integration::integration_pyo3_bin"
 skip="${skip-} --skip=integration::pyo3_cffi_build_script"
 skip="${skip-} --skip=pep517::pep517_default_profile"
 skip="${skip-} --skip=pep517::pep517_editable_profile"
+skip="${skip-} --skip=pgo::pgo_pyo3_mixed"
 
 # This relies on a hard-coded PyO3 version number, which needs to match the one
 # in test-crates/pyo3-pure/Cargo.lock. This is correct upstream as long as the

diff --git a/sources b/sources
index 295b998..11f5ec5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (maturin-1.14.1.tar.gz) = db2fd5fa98edafad85e42bd9a5eae45525a706b550604d49a62431211dc14a83841a851ce5a53bfd298ce4a14546efc62e8ef4349946e40d5f688ee16f6b2962
+SHA512 (maturin-1.15.0.tar.gz) = 5a863351f3b598a20b572888701921dd42a4ded85028f830f8e0ac7b3c8074b0d8b7cbe397446524501fb2bf7c4e48e217d0789251c9e405d9505fe68ded27cb

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-14  8:58 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-14  8:58 [rpms/maturin] epel10.3: Update to version 1.15.0; Fixes RHBZ#2522075 Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox