public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ansible-core] f44: Replace nowheel patch with %pyproject_patch_dependency
@ 2026-09-15 18:29 Maxwell G
  0 siblings, 0 replies; only message in thread
From: Maxwell G @ 2026-09-15 18:29 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/ansible-core
Branch : f44
Commit : 93300137a89e96e3884271dd65dc236cc6781e58
Author : Maxwell G <maxwell@gtmx.me>
Date   : 2026-09-15T13:29:06-05:00
Stats  : +1/-34 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ansible-core/c/93300137a89e96e3884271dd65dc236cc6781e58?branch=f44

Log:
Replace nowheel patch with %pyproject_patch_dependency

---
diff --git a/ansible-core.spec b/ansible-core.spec
index ae60ce1..6194d57 100644
--- a/ansible-core.spec
+++ b/ansible-core.spec
@@ -28,11 +28,6 @@ URL:            https://ansible.com
 Source0:        https://github.com/ansible/ansible/archive/v%{uversion}/%{name}-%{uversion}.tar.gz
 Source1:        https://github.com/ansible/ansible-documentation/archive/v%{uversion}/ansible-documentation-%{uversion}.tar.gz
 
-# Do not require wheel for building.
-# https://github.com/ansible/ansible/pull/85533 merged upstream.
-# The needlessly required wheel version was pinned, so get rid of it rather than unpinning.
-# Also, wheel is unwanted in ELN: https://github.com/fedora-eln/eln/issues/284
-Patch:          nowheel.patch
 # ansible-core 2.20 does not support Python 3.15 and upstream does not plan to do so until 2.22
 # This is a downstream-only patch to make it possible to build 2.20 with Python 3.15
 Patch:          allow-python3.15-build.patch
@@ -106,6 +101,7 @@ This package installs extensive documentation for ansible-core
 # Drop setuptools constraints
 # (rawhide might have newer setuptools, older releases might have older)
 %pyproject_patch_dependency setuptools:drop_constraints
+%pyproject_patch_dependency wheel:ignore
 
 sed -i -s 's|/usr/bin/env python|%{python3}|' \
     bin/ansible-test \

diff --git a/nowheel.patch b/nowheel.patch
deleted file mode 100644
index 4324380..0000000
--- a/nowheel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cbe48f56e5ee64ba6f26cf824f38625cb8569208 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 21 Oct 2025 03:35:19 +0200
-Subject: [PATCH] Do not require wheel for building (#85533)
-
-* Do not require wheel for building
-
-- current version of setuptools (70.1+) does not need wheel at all
-- older versions of setuptools would fetch wheel when building wheels (but not sdists)
-
-Cherry-picked from upstream commit 719681bbe2d9059ceba3c0092dc147c6961b06b9
----
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index a313c37..9a45e14 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,5 +1,5 @@
- [build-system]
--requires = ["setuptools >= 66.1.0, <= 82.0.1", "wheel == 0.45.1"]  # lower bound to support controller Python versions, upper bound for latest version tested at release
-+requires = ["setuptools >= 66.1.0, <= 82.0.0"]  # lower bound to support controller Python versions, upper bound for latest version tested at release
- build-backend = "setuptools.build_meta"
- 
- [project]
--- 
-2.53.0
-

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

only message in thread, other threads:[~2026-09-15 18:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-15 18:29 [rpms/ansible-core] f44: Replace nowheel patch with %pyproject_patch_dependency Maxwell G

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