gentoo auto-resync : 05:01:2025 - 06:31:57

4 files changed, 3 insertions, 112 deletions

diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index eb4ce0d29c45..1cac75fd8ffb 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,6 +1,3 @@
-AUX oslo-config-9.6.0-py312.patch 1745 BLAKE2B e9a9317c9f5943019029b437912bd8fcfa8f3531c69d43cf9202e87a4e8b26a605426c2ac41c041a64efed669fbe898384ceb7670bbccaec607aba9ea386ccfc SHA512 89bb7225a394fc6d965921413bc9fed882df9a9616a9f98c762433f00e4301df339da0bc18107bbe8f0a7f54a998c82e9651d451d9cb5547b4d8c7ef781cf3ea
-DIST oslo.config-9.6.0.tar.gz 164859 BLAKE2B 251e75d3ed919f2fce1efcd3aa5695da6e7911972ac89065813ef0c5b2b96fc02c436362875bf965b70e149d4436080ab23092f8f17568324e30eec7befe25cb SHA512 ebf31035bdf6f4ac8a9ce6bef14ca52fcad4418696520f0c199058211dbaa37723273a7c07eded03b139426392d7df6b192381af23e2324a92632029b1031292
 DIST oslo.config-9.7.0.tar.gz 164544 BLAKE2B 25e8ff7697878447a9b6e22802322378eadc0e0a519b5bc61daf4913c818189c6a5ccc100b9920e862cc102a7a8250566466cfc09968e9f58abe5caccc84b8e8 SHA512 573376d1fe0ea8ba2a0e3d681eb89524746da4287795b2373591be55cad0bd6bec59e593a61d9e6df27bded47207261d18855acddc81d4b1cc5cad27e4eaec82
-EBUILD oslo-config-9.6.0.ebuild 1637 BLAKE2B f18ebb895d586e61d04fae14a892194f5875c4c9c3e22ada4430031b097e2c4ad4d93962d963c1096b1bda99850790fd1fb1643ac9fe8c1a106b162de0fca6ef SHA512 8d9c7419979c114f1bcc23da638118df0acb5ccd363fd9fc7f2597a4e7d9f5be116ea34bedbc593da2961f587cb8b47d41c34cde134f6f95175310860e5555f4
-EBUILD oslo-config-9.7.0.ebuild 1522 BLAKE2B f414a73c6267d177d39320f190ffb1c3b79ef92bc861b41cf1c5c1a0d816597febbd90c7096ca0e7e7410b56a1b6475c9967001ba4657116aaa4f5ad79336e05 SHA512 832e50bd15313108797f505e2919c382c842618f61decccc1b8b161815bd0a885df908707bf14e9a576c3c65684f87e4de8efa5a950bb83e8c8511cf26137589
+EBUILD oslo-config-9.7.0.ebuild 1519 BLAKE2B b80b7cf56c7233b3fa117ba7e0123e03e4a47ee7bd6e78d3b90d3a7c7759d41bc93b5818f8d56c1753431719ac104a4ac429854e0f5b986ae3ae38cf4bb02b30 SHA512 6c85bb2fe3e3f7af74034fa3b08817a32c8241e96a260f92fd8db8f031cd7646739628353e75dda9ee4ddbc91665cb363ce8ed03a9695cfe302ac1a22628a18a
 MISC metadata.xml 759 BLAKE2B 88d0bbdc03286429f96554d184f664fbbdb4e067ed137f95a96a573c09b4573de90e50b2d5875d627c8b9ed03a0aec7233bdc8684b721e16085157480568c330 SHA512 a29b5a534042e949f780cfb000bd9ce9cde81ae1c5e6b429bd7854598a2d0f0c8b5358dc645135ba9016065460ff5b858e48e02cdbd12ade2b1fea9d0b407410
diff --git a/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch b/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch
deleted file mode 100644
index f105b7719199..000000000000
--- a/dev-python/oslo-config/files/oslo-config-9.6.0-py312.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 972d304bb23baef538ce759004410a20d8109ccb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 27 Aug 2024 15:54:45 +0200
-Subject: [PATCH] Fix test_sub_command_multiple on Python 3.12.5+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Update the expectations in test_sub_command_multiple for different
-argparse error handling in Python 3.12.5 and newer.  Previously,
-the 'cannot have multiple subparser arguments' error would be output
-to stderr and cause the parser to exit; now it raises an ArgumentError
-instead.
-
-Closes-Bug: 2074130
-Change-Id: I83de6b6943b14f1f6df86a55603e6867dce680d3
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- oslo_config/tests/test_cfg.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py
-index 1759ae7..383b70f 100644
---- a/oslo_config/tests/test_cfg.py
-+++ b/oslo_config/tests/test_cfg.py
-@@ -4385,8 +4385,12 @@ class SubCommandTestCase(BaseTestCase):
-         self.conf.register_cli_opt(cfg.SubCommandOpt('cmd1'))
-         self.conf.register_cli_opt(cfg.SubCommandOpt('cmd2'))
-         self.useFixture(fixtures.MonkeyPatch('sys.stderr', io.StringIO()))
--        self.assertRaises(SystemExit, self.conf, [])
--        self.assertIn('multiple', sys.stderr.getvalue())
-+        if sys.version_info >= (3, 12, 5):
-+            self.assertRaisesRegex(argparse.ArgumentError, 'multiple',
-+                                   self.conf, [])
-+        else:
-+            self.assertRaises(SystemExit, self.conf, [])
-+            self.assertIn('multiple', sys.stderr.getvalue())
- 
- 
- class SetDefaultsTestCase(BaseTestCase):
--- 
-2.46.0
-
diff --git a/dev-python/oslo-config/oslo-config-9.6.0.ebuild b/dev-python/oslo-config/oslo-config-9.6.0.ebuild
deleted file mode 100644
index 08a6668af8c9..000000000000
--- a/dev-python/oslo-config/oslo-config-9.6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.config/
-	https://github.com/openstack/oslo.config/
-	https://pypi.org/project/oslo.config/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	local PATCHES=(
-		# https://review.opendev.org/c/openstack/oslo.config/+/927273
-		"${FILESDIR}/${P}-py312.patch"
-	)
-
-	# broken by some dep upgrade
-	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
-		oslo_config/tests/test_cfg.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-9.7.0.ebuild b/dev-python/oslo-config/oslo-config-9.7.0.ebuild
index 31e09862511a..9b11d29e3978 100644
--- a/dev-python/oslo-config/oslo-config-9.7.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]