[rpms/python-barbicanclient] epel10.3: Sync from RDO bobcat release from python-barbicanclient-5.6.1-1.el9s

[rpms/python-barbicanclient] epel10.3: Sync from RDO bobcat release from python-barbicanclient-5.6.1-1.el9s

[Alfredo Moralejo]

A new commit has been pushed.

Repo   : rpms/python-barbicanclient
Branch : epel10.3
Commit : 03106e4c30a6b6403dbde47392b772f2250e2634
Author : Alfredo Moralejo <amoralej@redhat.com>
Date   : 2023-10-25T16:00:53+02:00
Stats  : +46/-32 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/python-barbicanclient/c/03106e4c30a6b6403dbde47392b772f2250e2634?branch=epel10.3

Log:
Sync from RDO bobcat release from python-barbicanclient-5.6.1-1.el9s

---
diff --git a/.gitignore b/.gitignore
index 9600d9a..1b2b6ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,6 @@
 /python-barbicanclient-5.5.0.tar.gz
 /0xa7475c5f2122fec3f90343223fe3bf5aad1080e4.txt
 /python-barbicanclient-5.5.0.tar.gz.asc
+/python-barbicanclient-5.6.1.tar.gz
+/0x815afec729392386480e076dcc0dfe2d21c023c9.txt
+/python-barbicanclient-5.6.1.tar.gz.asc

diff --git a/python-barbicanclient.spec b/python-barbicanclient.spec
index a4b0e21..9e6f17c 100644
--- a/python-barbicanclient.spec
+++ b/python-barbicanclient.spec
@@ -1,6 +1,12 @@
 %{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} }
-%global sources_gpg_sign 0xa7475c5f2122fec3f90343223fe3bf5aad1080e4
+%global sources_gpg_sign 0x815afec729392386480e076dcc0dfe2d21c023c9
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
+# we are excluding some BRs from automatic generator
+%global excluded_brs doc8 bandit pre-commit hacking flake8-import-order
+# Exclude sphinx from BRs if docs are disabled
+%if ! 0%{?with_doc}
+%global excluded_brs %{excluded_brs} sphinx openstackdocstheme
+%endif
 
 %global with_doc 1
 
@@ -12,11 +18,11 @@ Python library for accessing the API (barbicanclient module), and \
 a command-line script (barbican).
 
 Name:           python-barbicanclient
-Version:        5.5.0
-Release:        4%{?dist}
+Version:        5.6.1
+Release:        1%{?dist}
 Summary:        Client Library for OpenStack Barbican Key Management API
 
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://pypi.python.org/pypi/python-barbicanclient
 Source0:        https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
 # Required for tarball sources verification
@@ -38,21 +44,9 @@ BuildRequires:  git-core
 
 %package -n python3-%{sname}
 Summary:        Client Library for OpenStack Barbican Key Management API
-%{?python_provide:%python_provide python3-%{sname}}
-Obsoletes: python2-%{sname} < %{version}-%{release}
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-pbr
-BuildRequires:  python3-setuptools
-Requires:       python3-requests >= 2.14.2
-Requires:       python3-oslo-i18n >= 3.15.3
-Requires:       python3-oslo-serialization >= 2.18.0
-Requires:       python3-oslo-utils >= 3.33.0
-Requires:       python3-prettytable
-Requires:       python3-keystoneauth1 >= 5.1.1
-Requires:       python3-pbr >= 2.0.0
-Requires:       python3-cliff >= 2.8.0
-
+BuildRequires:  pyproject-rpm-macros
 %description -n python3-%{sname}
 %{common_desc}
 
@@ -60,12 +54,7 @@ Requires:       python3-cliff >= 2.8.0
 %package -n python-%{sname}-doc
 Summary: Documentation for OpenStack Barbican API client
 
-BuildRequires:  python3-sphinx
 BuildRequires:  python3-sphinxcontrib-rsvgconverter
-BuildRequires:  python3-openstackdocstheme
-BuildRequires:  python3-oslo-utils
-BuildRequires:  python3-oslo-i18n
-BuildRequires:  python3-prettytable
 
 %description -n python-%{sname}-doc
 Documentation for the barbicanclient module
@@ -77,23 +66,42 @@ Documentation for the barbicanclient module
 %{gpgverify}  --keyring=%{SOURCE102} --signature=%{SOURCE101} --data=%{SOURCE0}
 %endif
 %autosetup -n %{name}-%{upstream_version} -S git
-# let RPM handle deps
-sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 
-rm -rf {test-,}requirements.txt
+
+sed -i /^[[:space:]]*-c{env:.*_CONSTRAINTS_FILE.*/d tox.ini
+sed -i "s/^deps = -c{env:.*_CONSTRAINTS_FILE.*/deps =/" tox.ini
+sed -i /^minversion.*/d tox.ini
+sed -i /^requires.*virtualenv.*/d tox.ini
+
+# Exclude some bad-known BRs
+for pkg in %{excluded_brs}; do
+  for reqfile in doc/requirements.txt test-requirements.txt; do
+    if [ -f $reqfile ]; then
+      sed -i /^${pkg}.*/d $reqfile
+    fi
+  done
+done
+
+# Automatic BR generation
+%generate_buildrequires
+%if 0%{?with_doc}
+  %pyproject_buildrequires -t -e %{default_toxenv},docs
+%else
+  %pyproject_buildrequires -t -e %{default_toxenv}
+%endif
 
 %build
-%{py3_build}
+%pyproject_wheel
 
 %if 0%{?with_doc}
 # doc
-sphinx-build -b html doc/source doc/build/html
+%tox -e docs
 # Fix hidden-file-or-dir warnings
 rm -fr doc/build/html/.buildinfo
 %endif
 
 %install
-%{py3_install}
+%pyproject_install
 ln -s ./barbican %{buildroot}%{_bindir}/barbican-3
 
 %files -n python3-%{sname}
@@ -102,7 +110,7 @@ ln -s ./barbican %{buildroot}%{_bindir}/barbican-3
 %{_bindir}/barbican
 %{_bindir}/barbican-3
 %{python3_sitelib}/barbicanclient
-%{python3_sitelib}/python_barbicanclient-%{upstream_version}-py%{python3_version}.egg-info
+%{python3_sitelib}/python_barbicanclient-%{upstream_version}.dist-info
 
 %if 0%{?with_doc}
 %files -n python-%{sname}-doc
@@ -111,6 +119,9 @@ ln -s ./barbican %{buildroot}%{_bindir}/barbican-3
 %endif
 
 %changelog
+* Wed Oct 25 2023 Alfredo Moralejo <amoralej@gmail.com> 5.6.1-1
+- Update to upstream version 5.6.1
+
 * Wed Aut 16 2023 Alfredo Moralejo <amoralej@gmail.com> - 5.5.0-4
 - Switch to sphinx-build to create the documentation
 

diff --git a/sources b/sources
index c8841a5..c83993a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (python-barbicanclient-5.5.0.tar.gz) = 4f4f87ff62b509dde602ffb6b90509302c0f85a3a90300d53f2563c0999af315adc276c2297dda25933a72169ad3c2eb23f8ed5b57f10920f94b2a9a458af9aa
-SHA512 (0xa7475c5f2122fec3f90343223fe3bf5aad1080e4.txt) = cc8731a0fbdf791e51887609d13ee0ba402528572ab075419be998e29510211a6423fdfabc694eef8b654403d43cdcfc6b06ee244df58c5c4abc3e77ce85da24
-SHA512 (python-barbicanclient-5.5.0.tar.gz.asc) = cdbebbe4580bbbe49a4c6652a07220ff1fbadbdfafb109a6e4c9a7ed3ae1ddd79cd2f6d7878484e85b21a16fcf76bfb55a4751c6d4f945fc8fe3f68ac856b922
+SHA512 (python-barbicanclient-5.6.1.tar.gz) = 66b795e9ced520b8c5c5963b7449ec7b0230447043b45a1b095e9e808eb6885293f011b20e5077432be21f1d2344c222fc54cbba00c8cd49e282f07b8dc1a751
+SHA512 (0x815afec729392386480e076dcc0dfe2d21c023c9.txt) = be660eacaae93572475d0ae4e9cc29fc90897ec8a2ca8f4d0c5c7dcf682de9933e71a811f82b067fe5cb92de90165099ad7b49be98a6082c733a7f6b5b5f5a77
+SHA512 (python-barbicanclient-5.6.1.tar.gz.asc) = 16a6bf91b9a0f8957c61c174ea49347d321cb5ff004553ef051b2ff13285a74a45fcd6a437bd661567af9822b2e071c801a5b2a8dda8fa366563d5463362cd80