diff --git a/python-keyring.changes b/python-keyring.changes index a174c60..50124e3 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Oct 30 11:35:42 UTC 2022 - Ben Greiner + +- Drop support-new-importlib.patch + * "New" importlib 5.0 dropped deprecated indexing support + gh#python/importlib_metadata#405 + * See also gh#jaraco/keyring#526 + ------------------------------------------------------------------- Fri Sep 23 20:57:12 UTC 2022 - Ben Greiner diff --git a/python-keyring.spec b/python-keyring.spec index f3165a1..a9bc235 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -31,7 +31,6 @@ Summary: System keyring service access from Python License: MIT AND Python-2.0 URL: https://github.com/jaraco/keyring Source: https://files.pythonhosted.org/packages/source/k/keyring/keyring-%{version}.tar.gz -Patch0: support-new-importlib.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 56} @@ -78,6 +77,8 @@ sed -i '/^#!/d' keyring/cli.py %if %{with test} %check +# https://github.com/jaraco/keyring/issues/526 +rm -r keyring.egg-info %pytest %endif diff --git a/support-new-importlib.patch b/support-new-importlib.patch deleted file mode 100644 index ad43ffc..0000000 --- a/support-new-importlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: keyring-23.2.1/tests/test_packaging.py -=================================================================== ---- keyring-23.2.1.orig/tests/test_packaging.py -+++ keyring-23.2.1/tests/test_packaging.py -@@ -9,7 +9,7 @@ def test_entry_point(): - that's a callable. - """ - matches = metadata.entry_points(group='console_scripts', name='keyring') -- (script,) = matches -+ script = matches[0] - assert callable(script.load()) - -