[rpms/python-aodhclient] epel10: Sync from RDO bobcat release from python-aodhclient-3.3.0-1.el9s

[rpms/python-aodhclient] epel10: Sync from RDO bobcat release from python-aodhclient-3.3.0-1.el9s

[Alfredo Moralejo]

A new commit has been pushed.

Repo   : rpms/python-aodhclient
Branch : epel10
Commit : f63f97fa762a5208d232ca89bd0a181b5e9e2bd7
Author : Alfredo Moralejo <amoralej@redhat.com>
Date   : 2023-10-25T16:45:02+02:00
Stats  : +50/-34 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/python-aodhclient/c/f63f97fa762a5208d232ca89bd0a181b5e9e2bd7?branch=epel10

Log:
Sync from RDO bobcat release from python-aodhclient-3.3.0-1.el9s

---
diff --git a/.gitignore b/.gitignore
index 4e75863..7455d35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@
 /aodhclient-3.2.0.tar.gz
 /0xa7475c5f2122fec3f90343223fe3bf5aad1080e4.txt
 /aodhclient-3.2.0.tar.gz.asc
+/aodhclient-3.3.0.tar.gz
+/0x815afec729392386480e076dcc0dfe2d21c023c9.txt
+/aodhclient-3.3.0.tar.gz.asc

diff --git a/python-aodhclient.spec b/python-aodhclient.spec
index 2832ac7..e1949d1 100644
--- a/python-aodhclient.spec
+++ b/python-aodhclient.spec
@@ -1,8 +1,14 @@
 %{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} }
-%global sources_gpg_sign 0xa7475c5f2122fec3f90343223fe3bf5aad1080e4
+%global sources_gpg_sign 0x815afec729392386480e076dcc0dfe2d21c023c9
 %global pypi_name aodhclient
 
 %{!?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
 
 %global common_desc \
@@ -10,19 +16,19 @@ This is a client library for Aodh built on the Aodh API. It \
 provides a Python API (the aodhclient module) and a command-line tool.
 
 Name:             python-aodhclient
-Version:          3.2.0
-Release:          4%{?dist}
+Version:          3.3.0
+Release:          1%{?dist}
 Summary:          Python API and CLI for OpenStack Aodh
 
-License:          ASL 2.0
+License:          Apache-2.0
 URL:              https://launchpad.net/python-aodhclient
 Source0:          https://tarballs.openstack.org/%{name}/%{pypi_name}-%{upstream_version}.tar.gz
+Patch0:           0001-Revert-Add-OSprofiler-support-for-Aodh-client.patch
 # Required for tarball sources verification
 %if 0%{?sources_gpg} == 1
 Source101:        https://tarballs.openstack.org/%{name}/%{pypi_name}-%{upstream_version}.tar.gz.asc
 Source102:        https://releases.openstack.org/_static/%{sources_gpg_sign}.txt
 %endif
-Patch0:           0001-Revert-Add-OSprofiler-support-for-Aodh-client.patch
 
 BuildArch:        noarch
 
@@ -36,22 +42,11 @@ BuildRequires:  /usr/bin/gpgv2
 
 %package -n python3-%{pypi_name}
 Summary:          Python API and CLI for OpenStack Aodh
-%{?python_provide:%python_provide python3-%{pypi_name}}
 
-BuildRequires:    python3-setuptools
 BuildRequires:    python3-devel
-BuildRequires:    python3-pbr
+BuildRequires:    pyproject-rpm-macros
 BuildRequires:    git-core
 
-Requires:         python3-pbr
-Requires:         python3-cliff >= 1.14.0
-Requires:         python3-oslo-i18n >= 1.5.0
-Requires:         python3-oslo-serialization >= 1.4.0
-Requires:         python3-oslo-utils >= 2.0.0
-Requires:         python3-keystoneauth1 >= 1.0.0
-Requires:         python3-osc-lib >= 1.0.1
-Requires:         python3-pyparsing
-
 %description -n python3-%{pypi_name}
 %{common_desc}
 
@@ -59,13 +54,6 @@ Requires:         python3-pyparsing
 %package  doc
 Summary:          Documentation for OpenStack Aodh API Client
 
-BuildRequires:    python3-sphinx
-BuildRequires:    python3-openstackdocstheme
-BuildRequires:    python3-keystoneauth1
-BuildRequires:    python3-oslo-utils
-BuildRequires:    python3-oslo-serialization
-BuildRequires:    python3-cliff
-
 
 %description doc
 %{common_desc}
@@ -88,22 +76,44 @@ Requires:         python3-%{pypi_name} = %{version}-%{release}
 %endif
 %autosetup -n %{pypi_name}-%{upstream_version} -S git
 
-# Let RPM handle the requirements
-rm -f {,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
+sed -i '/\.\[test\]/,+1d' 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
+
+# Remove osprofiler as runtime dep
+sed -i /^osprofiler.*/d requirements.txt
+
+# 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
 
 %install
-%{py3_install}
+%pyproject_install
 
 # Create a versioned binary for backwards compatibility until everything is pure py3
 ln -s aodh %{buildroot}%{_bindir}/aodh-3
 
 %if 0%{?with_doc}
-export PYTHONPATH=.
-sphinx-build-3 -b html doc/source doc/build/html
+%tox -e docs
 # remove the sphinx-build-3 leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
 %endif
@@ -112,7 +122,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %doc README.rst
 %license LICENSE
 %{python3_sitelib}/aodhclient
-%{python3_sitelib}/*.egg-info
+%{python3_sitelib}/*.dist-info
 %{_bindir}/aodh
 %{_bindir}/aodh-3
 %exclude %{python3_sitelib}/aodhclient/tests
@@ -128,6 +138,9 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %endif
 
 %changelog
+* Wed Oct 25 2023 Alfredo Moralejo <amoralej@gmail.com> 3.3.0-1
+- Update to upstream version 3.3.0
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

diff --git a/sources b/sources
index 21bbe80..6f3dc58 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (aodhclient-3.2.0.tar.gz) = c9c34beeb5a94ab14f73c4f5859145764c02fb7f3a554025e8ae7a28b063404dae0f15e5ec5562c3ad843e6b3d04feb6ab8eec9c078f117fcd6f8efc70c30805
-SHA512 (0xa7475c5f2122fec3f90343223fe3bf5aad1080e4.txt) = cc8731a0fbdf791e51887609d13ee0ba402528572ab075419be998e29510211a6423fdfabc694eef8b654403d43cdcfc6b06ee244df58c5c4abc3e77ce85da24
-SHA512 (aodhclient-3.2.0.tar.gz.asc) = 9513071d450bedfc9215ca9ddd384739f87cb738be984b05874ac3561328e1b50dcf47825d07797e16c38afcac671a1b2dca0b61dcb31b27c36368ffbf0b7078
+SHA512 (aodhclient-3.3.0.tar.gz) = 605477cca814a682813f8a398f13ebc128d086b1d3249f21b1cb4337871258423f4335a5db04067ccf217ac45e856f264a9c2fbd5e886d1a92fb11c676adb3e3
+SHA512 (0x815afec729392386480e076dcc0dfe2d21c023c9.txt) = be660eacaae93572475d0ae4e9cc29fc90897ec8a2ca8f4d0c5c7dcf682de9933e71a811f82b067fe5cb92de90165099ad7b49be98a6082c733a7f6b5b5f5a77
+SHA512 (aodhclient-3.3.0.tar.gz.asc) = 901dad403abea3e65a48970b37c7fea366a06eb6d4cf50adeeee5e41266c15d32e1cb40282fcba4e56342f2081c51333f3fe3d4f718ac63345a4398671c3b812