public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Steve Traylen <steve.traylen@cern.ch>
To: git-commits@fedoraproject.org
Subject: [rpms/python-cliff] rawhide: Remove redundant patches
Date: Sun, 07 Jun 2026 19:35:29 GMT [thread overview]
Message-ID: <178086092973.1.17036975698252581913.rpms-python-cliff-952d52373915@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/python-cliff
Branch : rawhide
Commit : 952d5237391572e2494799124c7b9828acfed6a9
Author : Steve Traylen <steve.traylen@cern.ch>
Date : 2026-06-07T21:34:59+02:00
Stats : +0/-73 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/python-cliff/c/952d5237391572e2494799124c7b9828acfed6a9?branch=rawhide
Log:
Remove redundant patches
[skip changelog]
---
diff --git a/6af10b8.diff b/6af10b8.diff
deleted file mode 100644
index 7eb7ef6..0000000
--- a/6af10b8.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6af10b8905061856d4654dbe380f1de6c5a0eb76 Mon Sep 17 00:00:00 2001
-From: Benjamin A. Beasley <code@musicinmybrain.net>
-Date: Wed, 28 Sep 2022 08:28:18 -0400
-Subject: [PATCH] Use importlib.metadata on Python 3.10+
-
-Favor importlib.metadata.packages_distributions() over
-importlib_metadata.packages_distributions() where it is available, i.e.,
-on Python 3.10 and later.
-
-Depend on PyPI importlib_metadata only on Python 3.9 and older:
-conditionalize the requirements.txt entry on Python version.
-
-Change-Id: I624fc0059057de05bb2bacd9c1238cba71ebad2a
----
-
-diff --git a/cliff/command.py b/cliff/command.py
-index f8e38ad..57665ed 100644
---- a/cliff/command.py
-+++ b/cliff/command.py
-@@ -13,7 +13,12 @@
- import abc
- import inspect
-
--import importlib_metadata
-+try:
-+ # Python 3.10 and newer
-+ from importlib.metadata import packages_distributions
-+except ImportError:
-+ # Python 3.9 and older
-+ from importlib_metadata import packages_distributions
- from stevedore import extension
-
- from cliff import _argparse
-@@ -34,8 +39,7 @@
- # There can be multiple distribution in the case of namespace packages
- # so we'll just grab the first one
- _dists_by_mods = {
-- k: v[0] for k, v in
-- importlib_metadata.packages_distributions().items()
-+ k: v[0] for k, v in packages_distributions().items()
- }
- return _dists_by_mods
-
-diff --git a/requirements.txt b/requirements.txt
-index 79ed14f..4715045 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,6 +1,5 @@
- autopage>=0.4.0 # Apache 2.0
--# TODO: Drop this when Python 3.10 is our minimum supported version
--importlib_metadata>=4.4 # Apache-2.0
-+importlib_metadata>=4.4; python_version < '3.10' # Apache-2.0
- cmd2>=1.0.0 # MIT
- PrettyTable>=0.7.2 # BSD
- stevedore>=2.0.1 # Apache-2.0
diff --git a/relax-caller.patch b/relax-caller.patch
deleted file mode 100644
index d1eff95..0000000
--- a/relax-caller.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Backport of https://opendev.org/openstack/cliff/commit/fcf9710013e40c1aea22a76d76158acb56f5fc46
-
-diff -uNr cliff-4.8.0.ORIG/cliff/tests/test_help.py cliff-4.8.0/cliff/tests/test_help.py
---- cliff-4.8.0.ORIG/cliff/tests/test_help.py 2026-03-20 17:17:36.378380969 +0100
-+++ cliff-4.8.0/cliff/tests/test_help.py 2026-03-20 17:18:43.479346789 +0100
-@@ -110,8 +110,9 @@
- except help.HelpExit:
- pass
- help_text = stdout.getvalue()
-- basecommand = os.path.split(sys.argv[0])[1]
-- self.assertIn(f'usage: {basecommand} [--version]', help_text)
-+ usage_line = help_text.splitlines()[0]
-+ self.assertTrue(usage_line.startswith('usage: '), usage_line)
-+ self.assertIn('[--version]', usage_line)
- self.assertRegex(help_text, 'option(s|al arguments):\n --version')
- expected = (
- ' one Test command\n'
reply other threads:[~2026-06-07 19:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178086092973.1.17036975698252581913.rpms-python-cliff-952d52373915@fedoraproject.org \
--to=steve.traylen@cern.ch \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox