[rpms/python-aodhclient] epel10: Release 3.10.1

[Steve Traylen <steve.traylen@cern.ch>]

            A new commit has been pushed.

            Repo   : rpms/python-aodhclient
            Branch : epel10
            Commit : b533d5aa528137d5292dd778a0c316fc33260f06
            Author : Steve Traylen <steve.traylen@cern.ch>
            Date   : 2026-03-31T16:46:50+02:00
            Stats  : +93/-108 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-aodhclient/c/b533d5aa528137d5292dd778a0c316fc33260f06?branch=epel10

            Log:
            Release 3.10.1

- Resolves: rhbz#1637179

---
diff --git a/.gitignore b/.gitignore
index 8b23e04..b14a83b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@
 /0xf8675126e2411e7748dd46662fc2093e4682645f.txt
 /aodhclient-3.6.0.tar.gz.asc
 /aodhclient-3.6.0.tar.gz
+/0xb8e9315f48553ec5aff9ffe5e69d97da9efb5aff.txt
+/aodhclient-3.10.1.tar.gz
+/aodhclient-3.10.1.tar.gz.asc

diff --git a/0001-Remove-osprofiler-usage.patch b/0001-Remove-osprofiler-usage.patch
new file mode 100644
index 0000000..b9f1291
--- /dev/null
+++ b/0001-Remove-osprofiler-usage.patch
@@ -0,0 +1,44 @@
+From b38dce30d675457824eead10ce835da1646aa7e5 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 31 Mar 2026 16:34:59 +0200
+Subject: [PATCH] Remove osprofiler usage
+
+---
+ aodhclient/client.py | 2 --
+ requirements.txt     | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/aodhclient/client.py b/aodhclient/client.py
+index 3374a7a..00a1e9c 100644
+--- a/aodhclient/client.py
++++ b/aodhclient/client.py
+@@ -12,7 +12,6 @@
+ 
+ from keystoneauth1 import adapter
+ from oslo_utils import importutils
+-from osprofiler import web
+ 
+ from aodhclient import exceptions
+ 
+@@ -30,7 +29,6 @@ class SessionClient(adapter.Adapter):
+         # NOTE(sileht): The standard call raises errors from
+         # keystoneauth, where we need to raise the aodhclient errors.
+         raise_exc = kwargs.pop('raise_exc', True)
+-        kwargs['headers'].update(web.get_trace_id_headers())
+         resp = super().request(url, method, raise_exc=False, **kwargs)
+ 
+         if raise_exc and resp.status_code >= 400:
+diff --git a/requirements.txt b/requirements.txt
+index d40f6f2..1b7a79f 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -8,6 +8,5 @@ osc-lib>=1.0.1 # Apache-2.0
+ oslo.i18n>=1.5.0 # Apache-2.0
+ oslo.serialization>=1.4.0 # Apache-2.0
+ oslo.utils>=2.0.0 # Apache-2.0
+-osprofiler>=1.4.0 # Apache-2.0
+ keystoneauth1>=1.0.0
+ pyparsing>2.1.0 # MIT
+-- 
+2.53.0
+

diff --git a/0001-Revert-Add-OSprofiler-support-for-Aodh-client.patch b/0001-Revert-Add-OSprofiler-support-for-Aodh-client.patch
deleted file mode 100644
index 139d22b..0000000
--- a/0001-Revert-Add-OSprofiler-support-for-Aodh-client.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8bf8c358307fc08e15a23c36fa95853c259de78d Mon Sep 17 00:00:00 2001
-From: Alfredo Moralejo <amoralej@redhat.com>
-Date: Mon, 21 Nov 2022 15:25:14 +0100
-Subject: [PATCH] Revert "Add OSprofiler support for Aodh client"
-
-This reverts commit fb22e9826256ef090b8ae043583fee0a4cb481fc.
----
- aodhclient/client.py | 2 --
- requirements.txt     | 3 +--
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/aodhclient/client.py b/aodhclient/client.py
-index bb2ec09..662bde9 100644
---- a/aodhclient/client.py
-+++ b/aodhclient/client.py
-@@ -12,7 +12,6 @@
- 
- from keystoneauth1 import adapter
- from oslo_utils import importutils
--from osprofiler import web
- 
- from aodhclient import exceptions
- 
-@@ -30,7 +29,6 @@ class SessionClient(adapter.Adapter):
-         # NOTE(sileht): The standard call raises errors from
-         # keystoneauth, where we need to raise the aodhclient errors.
-         raise_exc = kwargs.pop('raise_exc', True)
--        kwargs['headers'].update(web.get_trace_id_headers())
-         resp = super(SessionClient, self).request(url,
-                                                   method,
-                                                   raise_exc=False,
-diff --git a/requirements.txt b/requirements.txt
--index f2b84d9..ed9eff0 100644
-+index 80d0aca..e2ac44c 100644
- --- a/requirements.txt
- +++ b/requirements.txt
--@@ -8,6 +8,5 @@ osc-lib>=1.0.1 # Apache-2.0
-+@@ -8,7 +8,6 @@ osc-lib>=1.0.1 # Apache-2.0
-  oslo.i18n>=1.5.0 # Apache-2.0
-  oslo.serialization>=1.4.0 # Apache-2.0
-  oslo.utils>=2.0.0 # Apache-2.0
- -osprofiler>=1.4.0 # Apache-2.0
-  keystoneauth1>=1.0.0
---pyparsing
--\ No newline at end of file
--+pyparsing
---- 
--2.34.1
--
-+ pyparsing
-+ SQLAlchemy-Utils<=0.38.3
-

diff --git a/python-aodhclient.spec b/python-aodhclient.spec
index 466a356..4af4991 100644
--- a/python-aodhclient.spec
+++ b/python-aodhclient.spec
@@ -1,57 +1,51 @@
-%{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} }
-%global sources_gpg_sign 0xf8675126e2411e7748dd46662fc2093e4682645f
-%global pypi_name aodhclient
+%global sources_gpg 1
+%global sources_gpg_sign 0xb8e9315f48553ec5aff9ffe5e69d97da9efb5aff
 
-%{!?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 pypi_name aodhclient
 
-%global common_desc \
-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.
+%global common_desc %{expand:
+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.6.0
+Version:          3.10.1
 Release:          %autorelease
 Summary:          Python API and CLI for OpenStack Aodh
 
 License:          Apache-2.0
 URL:              https://launchpad.net/python-aodhclient
-Source0:          https://tarballs.openstack.org/%{name}/%{pypi_name}-%{upstream_version}.tar.gz
-%if 0%{?fedora}
-Patch0:           0001-Revert-Add-OSprofiler-support-for-Aodh-client.patch
-%endif
+Source0:          https://tarballs.openstack.org/%{name}/%{pypi_name}-%{version}.tar.gz
+# Profiler not available in Fedora
+Patch0:           0001-Remove-osprofiler-usage.patch
 # Required for tarball sources verification
 %if 0%{?sources_gpg} == 1
-Source101:        https://tarballs.openstack.org/%{name}/%{pypi_name}-%{upstream_version}.tar.gz.asc
+Source101:        https://tarballs.openstack.org/%{name}/%{pypi_name}-%{version}.tar.gz.asc
 Source102:        https://releases.openstack.org/_static/%{sources_gpg_sign}.txt
 %endif
 
 BuildArch:        noarch
 
+BuildRequires:    python3-devel
+BuildRequires:    git-core
+
 # Required for tarball sources verification
 %if 0%{?sources_gpg} == 1
 BuildRequires:  /usr/bin/gpgv2
 %endif
 
+
 %description
 %{common_desc}
 
+
 %package -n python3-%{pypi_name}
 Summary:          Python API and CLI for OpenStack Aodh
 
-BuildRequires:    python3-devel
-BuildRequires:    pyproject-rpm-macros
-BuildRequires:    git-core
 
 %description -n python3-%{pypi_name}
 %{common_desc}
 
+
 %if 0%{?with_doc}
 %package  doc
 Summary:          Documentation for OpenStack Aodh API Client
@@ -64,58 +58,50 @@ Summary:          Documentation for OpenStack Aodh API Client
 This package contains auto-generated documentation.
 %endif
 
+
 %package -n python3-%{pypi_name}-tests
 Summary:          Python API and CLI for OpenStack Aodh Tests
 Requires:         python3-%{pypi_name} = %{version}-%{release}
 
+
 %description -n python3-%{pypi_name}-tests
 %{common_desc}
 
+
 %prep
 # Required for tarball sources verification
 %if 0%{?sources_gpg} == 1
 %{gpgverify}  --keyring=%{SOURCE102} --signature=%{SOURCE101} --data=%{SOURCE0}
 %endif
-%autosetup -n %{pypi_name}-%{upstream_version} -S git
+%autosetup -n %{pypi_name}-%{version} -S git
 
+sed -i /^[[:space:]]*-c{env:.*_CONSTRAINTS_FILE.*/d tox.ini
 
+sed -i \
+    -e "/^coverage[[:space:]]*[><=]/d" \
+    -e "/^pifpaf[[:space:]]*[><=]/d" \
+    -e "/^tempest[[:space:]]*[><=]/d" \
+    -e "/^reno[[:space:]]*[><=]/d" \
+    test-requirements.txt doc/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
-
-%if 0%{?fedora}
-# Remove osprofiler as runtime dep
-sed -i /^osprofiler.*/d requirements.txt
-%endif
 
-# Automatic BR generation
 %generate_buildrequires
 %if 0%{?with_doc}
-  %pyproject_buildrequires -t -e %{default_toxenv},docs
+%pyproject_buildrequires -t -e %{default_toxenv},docs
 %else
-  %pyproject_buildrequires -t -e %{default_toxenv}
+%pyproject_buildrequires -t -e %{default_toxenv}
 %endif
 
+
 %build
 %pyproject_wheel
 
+
 %install
 %pyproject_install
 
-# Create a versioned binary for backwards compatibility until everything is pure py3
-ln -s aodh %{buildroot}%{_bindir}/aodh-3
+%pyproject_save_files -l aodhclient
+
 
 %if 0%{?with_doc}
 %tox -e docs
@@ -123,24 +109,28 @@ ln -s aodh %{buildroot}%{_bindir}/aodh-3
 rm -rf doc/build/html/.{doctrees,buildinfo}
 %endif
 
-%files -n python3-%{pypi_name}
+
+%check
+%tox -e %{default_toxenv}
+
+
+%files -n python3-%{pypi_name} -f %{pyproject_files}
 %doc README.rst
 %license LICENSE
-%{python3_sitelib}/aodhclient
-%{python3_sitelib}/*.dist-info
 %{_bindir}/aodh
-%{_bindir}/aodh-3
-%exclude %{python3_sitelib}/aodhclient/tests
+
 
 %files -n python3-%{pypi_name}-tests
 %license LICENSE
 %{python3_sitelib}/aodhclient/tests
 
+
 %if 0%{?with_doc}
 %files doc
 %doc doc/build/html
 %license LICENSE
 %endif
 
+
 %changelog
 %autochangelog

diff --git a/sources b/sources
index f104595..1a9ea6f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (0xf8675126e2411e7748dd46662fc2093e4682645f.txt) = 1e9471d80d44bb3570b8054e845583b4c06f7177dc4fa8a5907e6185806ce794a594bf42d5c336ee20004a58e53748f275b749816e75f4cc3b9fecb8075ccbdf
-SHA512 (aodhclient-3.6.0.tar.gz.asc) = f83b74b2ef0308cf5102d58baa25076d371dd0652ed8576bcff6f07c1717fd47163348b85d4fdff2a102be47693d091e5d69b8dcea17f14705b82e6e0d996618
-SHA512 (aodhclient-3.6.0.tar.gz) = 4f168a1d54d376c397b233328f3949bdb7ad388d6caa4ed500600a6b95c330514bd017a1e4780e814b2977fce6a48534c1e7cc8722b889ceec054e4fd623bbbf
+SHA512 (0xb8e9315f48553ec5aff9ffe5e69d97da9efb5aff.txt) = 0b92cb980baab073ca49f66f0dbc2c3a939c677b00351dd693063520e9788e2c753c8ee3a8960b953acc2ef77c0150d1da76fe1a9d3b65f57fa1167628885788
+SHA512 (aodhclient-3.10.1.tar.gz) = 00011b3c41516920a419b9c5f9ecd90f95679ba0885c7dd1936ea6cd111a6f00c304d3b56c326a5ceeb5f4546b4563500256cb60a1db12f677e4000234cd30ea
+SHA512 (aodhclient-3.10.1.tar.gz.asc) = e834109a8627bd9761c3f1407bf2bfcf0f300851492b509d1dd7038a6e586dbbd188ada5606ef233f0cad773c5597e0499d2ff7304c87e514543ee58e46fa183