Notification time stamped 2022-03-31 21:43:50 UTC
From 29648ea1c7d76c79d20df372f39ef86affaab8af Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mar 24 2022 22:04:41 +0000
Subject: Update to 23.5.0 (close RHBZ#1920125)
---
diff --git a/.gitignore b/.gitignore
index 02e5182..37cee3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/keyring-21.3.1.tar.gz
/keyring-21.5.0.tar.gz
/keyring-21.8.0.tar.gz
+/keyring-23.5.0.tar.gz
diff --git a/fix-setuptools.patch b/fix-setuptools.patch
deleted file mode 100644
index e725ee6..0000000
--- a/fix-setuptools.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 79f088a..aede1df 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,5 +1,5 @@
- [build-system]
--requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"]
-+requires = ["setuptools>=39.2.0", "wheel", "setuptools_scm>=1.15.7"]
- build-backend = "setuptools.build_meta"
-
- [tool.black]
-diff --git a/setup.cfg b/setup.cfg
-index 6f537b8..f0620d3 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -25,7 +25,7 @@ install_requires =
- SecretStorage>=3.2; sys_platform=="linux"
- jeepney>=0.4.2; sys_platform=="linux"
- importlib_metadata >= 1; python_version < "3.8"
--setup_requires = setuptools_scm[toml] >= 3.4.1
-+setup_requires = setuptools_scm >= 1.15.7
-
- [options.extras_require]
- testing =
-diff --git a/setup.py b/setup.py
-index bac24a4..827e955 100644
---- a/setup.py
-+++ b/setup.py
-@@ -3,4 +3,4 @@
- import setuptools
-
- if __name__ == "__main__":
-- setuptools.setup()
-+ setuptools.setup(use_scm_version=True)
diff --git a/python-keyring.spec b/python-keyring.spec
index ec1e904..039b94c 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -1,8 +1,8 @@
%bcond_without tests
Name: python-keyring
-Version: 21.8.0
-Release: 6%{?dist}
+Version: 23.5.0
+Release: 1%{?dist}
Summary: Store and access your passwords safely
License: MIT and Python
@@ -11,23 +11,14 @@ Source0: %{pypi_source keyring}
BuildArch: noarch
-# Patch required for EPEL8 to allow older setuptools and setuptools_scm
-Patch0: fix-setuptools.patch
-
BuildRequires: python3-devel
BuildRequires: python3dist(setuptools)
-%if 0%{?epel} == 8
-BuildRequires: python3dist(setuptools-scm)
-%else
BuildRequires: python3dist(setuptools-scm[toml])
-%endif
%if %{with tests}
# setup.cfg: install_requires
-%if 0%{?epel} == 8
-BuildRequires: python3dist(importlib-metadata)
-%endif
BuildRequires: python3dist(secretstorage)
BuildRequires: python3dist(jeepney)
+BuildRequires: python3dist(importlib-metadata)
# setup.cfg: [testing] extra (but without linting/typechecking/coverage)
BuildRequires: python3dist(pytest)
%endif
@@ -55,22 +46,12 @@ Other keyring implementations are available through third-party backends.}
%package -n python3-keyring
Summary: Python 3 library to access the system keyring service
-# On current Fedora/EPEL9, see %%py_provides, and note that the necessary
-# Provides are handled automatically since the subpackage matches the PyPI
-# canonical name.
-%if 0%{?epel} == 8
-%{?python_provide:%python_provide python3-keyring}
-%endif
-
%description -n python3-keyring
%desc
%prep
%setup -q -n keyring-%{version}
-%if 0%{?epel} == 8
-%patch0 -p1
-%endif
rm -frv keyring.egg-info
@@ -83,7 +64,7 @@ rm -frv keyring.egg-info
%py3_install
# For compatibility with historical versions of this package, when there were
# both python2 and python3 packages:
-cp -a %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-python3
+ln -s keyring %{buildroot}%{_bindir}/keyring-python3
%check
@@ -95,7 +76,14 @@ cp -a %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-python3
# but without a SecretService or KWallet daemon to communicate with, this still
# won’t allow any more tests to be executed. Fortunately, we can still run some
# of the tests, and those that can’t be run are automatically skipped.
-%pytest
+
+# This fails because it finds two EntryPoint instances. Replicating the test in
+# with the final installed RPM produces only one, as the test is expecting, so
+# this seems to be an artifact of the build environment. See upstream issue:
+# https://github.com/jaraco/keyring/issues/526
+k="${k-}${k+ and }not test_entry_point"
+
+%pytest -k "${k-}"
%endif
@@ -111,6 +99,11 @@ cp -a %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-python3
%changelog
+* Thu Mar 24 2022 Benjamin A. Beasley <code(a)musicinmybrain.net> - 23.5.0-1
+- Update to 23.5.0 (close RHBZ#1920125)
+- Drop EPEL8 compatibility in the Fedora spec file: this upstream release
+ requires setuptools features not available in EPEL8
+
* Tue Mar 22 2022 Benjamin A. Beasley <code(a)musicinmybrain.net> - 21.8.0-6
- Drop workarounds for EPEL7 and for EOL Fedoras
- Update description text from upstream
diff --git a/sources b/sources
index e2353ab..639923d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keyring-21.8.0.tar.gz) = 941b505a69fb4bb592576bfef7c071c045b1a72a1c44368517801cc5241dd6992174e3fdaf43f2f44ab7d9e6f4a464ab4347b49ae69405dda378b9e0f6766bc6
+SHA512 (keyring-23.5.0.tar.gz) = 5531c3d2287cbaa506ab10bf6b56e16b52a16e178ef322fea3b66c7626ea78698f863f19a699b9937b3052e47135e3dc603d28fac1ad9470d6df8bf5b8fa897e
https://src.fedoraproject.org/rpms/python-keyring/c/29648ea1c7d76c79d20df37…
Notification time stamped 2022-03-31 21:43:50 UTC
From aa0c69fd2e52248b152ee21d992b6ddfa8ac8034 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mar 24 2022 22:04:41 +0000
Subject: Use xvfb to run the tests for the libsecret backend
---
diff --git a/python-keyring.spec b/python-keyring.spec
index 039b94c..827c3d3 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -21,6 +21,13 @@ BuildRequires: python3dist(jeepney)
BuildRequires: python3dist(importlib-metadata)
# setup.cfg: [testing] extra (but without linting/typechecking/coverage)
BuildRequires: python3dist(pytest)
+# Run graphical tests in non-graphical build environment.
+BuildRequires: xorg-x11-server-Xvfb
+# Enable libsecret backend
+BuildRequires: python3-gobject
+BuildRequires: libsecret
+BuildRequires: gnome-keyring
+BuildRequires: /usr/bin/dbus-launch
%endif
%global desc %{expand: \
@@ -69,20 +76,13 @@ ln -s keyring %{buildroot}%{_bindir}/keyring-python3
%check
%if %{with tests}
-# We could run graphical tests with:
-# BuildRequires: xorg-x11-server-Xvfb
-# and
-# %%global __pytest /usr/bin/xvfb-run -a /usr/bin/pytest
-# but without a SecretService or KWallet daemon to communicate with, this still
-# won’t allow any more tests to be executed. Fortunately, we can still run some
-# of the tests, and those that can’t be run are automatically skipped.
-
# This fails because it finds two EntryPoint instances. Replicating the test in
# with the final installed RPM produces only one, as the test is expecting, so
# this seems to be an artifact of the build environment. See upstream issue:
# https://github.com/jaraco/keyring/issues/526
k="${k-}${k+ and }not test_entry_point"
+%global __pytest /usr/bin/xvfb-run -a /usr/bin/pytest
%pytest -k "${k-}"
%endif
@@ -103,6 +103,7 @@ k="${k-}${k+ and }not test_entry_point"
- Update to 23.5.0 (close RHBZ#1920125)
- Drop EPEL8 compatibility in the Fedora spec file: this upstream release
requires setuptools features not available in EPEL8
+- Use xvfb to run the tests for the libsecret backend
* Tue Mar 22 2022 Benjamin A. Beasley <code(a)musicinmybrain.net> - 21.8.0-6
- Drop workarounds for EPEL7 and for EOL Fedoras
https://src.fedoraproject.org/rpms/python-keyring/c/aa0c69fd2e52248b152ee21…
Notification time stamped 2022-03-31 21:43:50 UTC
From 3dd45e6c30ccb9f417d3cc091f5fcc673b06db95 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mar 27 2022 12:33:06 +0000
Subject: Disable xvfb tests by default because they may hang in koji
---
diff --git a/python-keyring.spec b/python-keyring.spec
index 827c3d3..53cf9b3 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -1,4 +1,6 @@
%bcond_without tests
+# The xvfb tests sometimes hang in koji.
+%bcond_with xvfb_tests
Name: python-keyring
Version: 23.5.0
@@ -21,6 +23,7 @@ BuildRequires: python3dist(jeepney)
BuildRequires: python3dist(importlib-metadata)
# setup.cfg: [testing] extra (but without linting/typechecking/coverage)
BuildRequires: python3dist(pytest)
+%if %{with xvfb_tests}
# Run graphical tests in non-graphical build environment.
BuildRequires: xorg-x11-server-Xvfb
# Enable libsecret backend
@@ -29,6 +32,7 @@ BuildRequires: libsecret
BuildRequires: gnome-keyring
BuildRequires: /usr/bin/dbus-launch
%endif
+%endif
%global desc %{expand: \
The Python keyring library provides an easy way to access the system keyring
@@ -82,7 +86,9 @@ ln -s keyring %{buildroot}%{_bindir}/keyring-python3
# https://github.com/jaraco/keyring/issues/526
k="${k-}${k+ and }not test_entry_point"
+%if %{with xvfb_tests}
%global __pytest /usr/bin/xvfb-run -a /usr/bin/pytest
+%endif
%pytest -k "${k-}"
%endif
@@ -103,7 +109,8 @@ k="${k-}${k+ and }not test_entry_point"
- Update to 23.5.0 (close RHBZ#1920125)
- Drop EPEL8 compatibility in the Fedora spec file: this upstream release
requires setuptools features not available in EPEL8
-- Use xvfb to run the tests for the libsecret backend
+- Allow using xvfb to run the tests for the libsecret backend; disable by
+ default because tests occasionally hang in koji when doing so
* Tue Mar 22 2022 Benjamin A. Beasley <code(a)musicinmybrain.net> - 21.8.0-6
- Drop workarounds for EPEL7 and for EOL Fedoras
https://src.fedoraproject.org/rpms/python-keyring/c/3dd45e6c30ccb9f417d3cc0…