gentoo auto-resync : 25:03:2023 - 00:48:54

5 files changed, 2 insertions, 165 deletions

diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index aa86ea29df33..6bdfc8c624bc 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,7 +1,3 @@
-AUX python-cinderclient-9.1.0-fix-py3.11-argparse.patch 2529 BLAKE2B 28cc877b2e77ae034df5fcdfdbf12b9478eed4d952e547be76925cdc5d3932788f637fd2d043a1f7432f62cd3cffbe8a887279fe05956cf5ecfff645b94a7d55 SHA512 3b2f427a1d80ed9f5d0318cd738a6f3e3c0e1929febf8a872b1636843109cf3f4b44a81b371a35ce658562cf2563dac103fae8632bf06e856283b56a933dd507
-AUX python-cinderclient-9.1.0-fix-py3.11-crashes.patch 2148 BLAKE2B f7e8a4512e48689d1ce17d13c01ac9dd6c0b875b0ff67307e35d2f9d4e85b13d97ba660f8b53452eebe55a6919a4f52a18ca4b20f57529eae3ae64e187f75c31 SHA512 79fe4a908609994550067f96454f4a4c12268fdebb9c8fccf2dd09d239d208adbfacd5f5591a1d5dd29bdf711c6b38a4800b97826a373f10a8cad472a30ef87f
-DIST python-cinderclient-9.2.0.tar.gz 235773 BLAKE2B 1b4e1c27dec6d74a2c95e3aadbdfb296bf6105ba5a23599babfcf8fc5c37fb52eecf7897eaa0680277b903b1725de2cb7d9a108942fa1be5067b25dce8ca0c72 SHA512 76032779bfa2dbc6c7aecc6631ab42b80bff21437d5037e6bbc5d78a23ce493a7a185c4ee8c1657b41c0bf376a6c919b027f81577f2826fc4222334d8216fda5
 DIST python-cinderclient-9.3.0.tar.gz 236158 BLAKE2B 7f21485e907597de77ba9998e190c4ea05d3b968fb1886bd980e5f15addf26b35acf096c2c3b28e6d05d95125dbd568362ce500ff8643da27baa45b165f5e105 SHA512 3e8b957517a394f2b72cfb8f3442d8b57d4487be476e10f16c112134c1e5a8548056ce0a0cf75cac55d8a607e34e535593130f25aa413c86adf301465112dbb2
-EBUILD python-cinderclient-9.2.0.ebuild 1453 BLAKE2B 17180a5392abd3079c1a96320868253516839ae31e6cf4d6ae19b22f6bb99726d680bdaad403748ba17228ad51642783239afb015048df006392d5e0a1eb899b SHA512 5b9b6549f2567b8df37bd740fbc9a17c8d997505d95f812caab34fb778c224eb6cc0499f4bfb54639797ad8859f25306344a229c74021d64699479de9f1ac1cf
-EBUILD python-cinderclient-9.3.0.ebuild 1371 BLAKE2B bb411655a78caf792d7bd9e6213d93bd617c084f62b07c25a437c1cf0fde07ee00bc14faf894126531d094793833b74b336342e79cc996efc7a01f0997e37a13 SHA512 ace5e72eaa5854ac0d4a2454ff30508a01ae55b87bb7bb8bc4d7d0afa2b497ab1ef5f6e562b41bbf66a5bdd1696036f9c265b820b4ccf48d0546c052ee6b1e55
+EBUILD python-cinderclient-9.3.0.ebuild 1369 BLAKE2B 9a69b2bd4b3dc6a2c6b42ce6ab608b0b607ee5f3b0086b454760eb4bc922fac14b4565502750444ded911e86fc32657a7accaec770b458984f8cef29568b6fd1 SHA512 adcadd53f1b147a7ac3c711ae6077288b34c033848948c832180659c29419cecf1536127a5ef7478eb37689a23b8a0b302ff3746ac2e62c0dea0eabd38631989
 MISC metadata.xml 727 BLAKE2B 0017cc08edf25f27b8a2816bc3ce1374148a17522bf2c5ea643ad10cde9f5779b1b6bf1e3c91627db76d2f77b8dcbfc87a29fb2cdd8064b3140fb14d1e6e00a1 SHA512 e30e64371f7a5f5fa506396f2edbbc7f862a585c7fe9af4f6fe63e99d4bbe9f9bf3a1f002a62c40ab9d75bd90ab99446bb80bf7f2fedf5b37287eeb54e5dacbe
diff --git a/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-argparse.patch b/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-argparse.patch
deleted file mode 100644
index 863e4d93b298..000000000000
--- a/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-argparse.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://review.opendev.org/c/openstack/python-cinderclient/+/851467
-From: Cyril Roelandt <cyril@redhat.com>
-Date: Thu, 28 Jul 2022 20:48:58 +0200
-Subject: [PATCH] Python3.11: Fix argparse-related test failures
-
-Closes-Bug: #1983054
-Change-Id: I2d4cb81a394f3c10e5f01945d894746a904fb5df
---- a/cinderclient/tests/unit/test_shell.py
-+++ b/cinderclient/tests/unit/test_shell.py
-@@ -376,7 +376,7 @@
-
-         self.mock_completion()
-
--    def test_load_versioned_actions(self):
-+    def test_load_versioned_actions_v3_0(self):
-         parser = cinderclient.shell.CinderClientArgumentParser()
-         subparsers = parser.add_subparsers(metavar='<subcommand>')
-         shell = cinderclient.shell.OpenStackCinderShell()
-@@ -388,6 +388,10 @@
-             "fake_action 3.0 to 3.1",
-             shell.subcommands['fake-action'].get_default('func')())
-
-+    def test_load_versioned_actions_v3_2(self):
-+        parser = cinderclient.shell.CinderClientArgumentParser()
-+        subparsers = parser.add_subparsers(metavar='<subcommand>')
-+        shell = cinderclient.shell.OpenStackCinderShell()
-         shell.subcommands = {}
-         shell._find_actions(subparsers, fake_actions_module,
-                             api_versions.APIVersion("3.2"), False, [])
-@@ -521,7 +525,7 @@
-
-     @mock.patch.object(cinderclient.shell.CinderClientArgumentParser,
-                        'add_argument')
--    def test_load_actions_with_versioned_args(self, mock_add_arg):
-+    def test_load_actions_with_versioned_args_v36(self, mock_add_arg):
-         parser = cinderclient.shell.CinderClientArgumentParser(add_help=False)
-         subparsers = parser.add_subparsers(metavar='<subcommand>')
-         shell = cinderclient.shell.OpenStackCinderShell()
-@@ -533,8 +537,13 @@
-         self.assertNotIn(mock.call('--foo', help="second foo"),
-                          mock_add_arg.call_args_list)
-
--        mock_add_arg.reset_mock()
--
-+    @mock.patch.object(cinderclient.shell.CinderClientArgumentParser,
-+                       'add_argument')
-+    def test_load_actions_with_versioned_args_v39(self, mock_add_arg):
-+        parser = cinderclient.shell.CinderClientArgumentParser(add_help=False)
-+        subparsers = parser.add_subparsers(metavar='<subcommand>')
-+        shell = cinderclient.shell.OpenStackCinderShell()
-+        shell.subcommands = {}
-         shell._find_actions(subparsers, fake_actions_module,
-                             api_versions.APIVersion("3.9"), False, [])
-         self.assertNotIn(mock.call('--foo', help="first foo"),
diff --git a/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-crashes.patch b/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-crashes.patch
deleted file mode 100644
index 3f86c3a50ade..000000000000
--- a/dev-python/python-cinderclient/files/python-cinderclient-9.1.0-fix-py3.11-crashes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://review.opendev.org/c/openstack/python-cinderclient/+/851446
-From: Cyril Roelandt <cyril@redhat.com>
-Date: Thu, 28 Jul 2022 20:14:36 +0200
-Subject: [PATCH] Python3.11: fix crashes in ShellTest
-
-Closes-Bug: #1983047
-Change-Id: If20abef109ddd7107c83b5886beb666a6550a640
---- a/cinderclient/tests/unit/test_shell.py
-+++ b/cinderclient/tests/unit/test_shell.py
-@@ -120,9 +120,9 @@
-         # Some expected help output, including microversioned commands
-         required = [
-             r'.*?^usage: ',
--            r'.*?(?m)^\s+create\s+Creates a volume.',
--            r'.*?(?m)^\s+summary\s+Get volumes summary.',
--            r'.*?(?m)^Run "cinder help SUBCOMMAND" for help on a subcommand.',
-+            r'.*?^\s+create\s+Creates a volume.',
-+            r'.*?^\s+summary\s+Get volumes summary.',
-+            r'.*?^Run "cinder help SUBCOMMAND" for help on a subcommand.',
-         ]
-         help_text = self.shell('help')
-         for r in required:
-@@ -132,7 +132,7 @@
-     def test_help_on_subcommand(self):
-         required = [
-             r'.*?^usage: cinder list',
--            r'.*?(?m)^Lists all volumes.',
-+            r'.*?^Lists all volumes.',
-         ]
-         help_text = self.shell('help list')
-         for r in required:
-@@ -142,7 +142,7 @@
-     def test_help_on_subcommand_mv(self):
-         required = [
-             r'.*?^usage: cinder summary',
--            r'.*?(?m)^Get volumes summary.',
-+            r'.*?^Get volumes summary.',
-         ]
-         help_text = self.shell('help summary')
-         for r in required:
-@@ -152,9 +152,9 @@
-     def test_help_arg_no_subcommand(self):
-         required = [
-             r'.*?^usage: ',
--            r'.*?(?m)^\s+create\s+Creates a volume.',
--            r'.*?(?m)^\s+summary\s+Get volumes summary.',
--            r'.*?(?m)^Run "cinder help SUBCOMMAND" for help on a subcommand.',
-+            r'.*?^\s+create\s+Creates a volume.',
-+            r'.*?^\s+summary\s+Get volumes summary.',
-+            r'.*?^Run "cinder help SUBCOMMAND" for help on a subcommand.',
-         ]
-         help_text = self.shell('--os-volume-api-version 3.40')
-         for r in required:
diff --git a/dev-python/python-cinderclient/python-cinderclient-9.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-9.2.0.ebuild
deleted file mode 100644
index 0ba5931addb3..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-9.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth1-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
-"
-# Tests fail with dev-python/prettytable-3.4.0
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslo-serialization[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		<dev-python/prettytable-3.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.1.0-fix-py3.11-argparse.patch"
-	"${FILESDIR}/${PN}-9.1.0-fix-py3.11-crashes.patch"
-)
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b cinderclient/tests/unit
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-9.3.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-9.3.0.ebuild
index 8c820686265d..754c5edd0fd0 100644
--- a/dev-python/python-cinderclient/python-cinderclient-9.3.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-9.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth1-4.3.1[${PYTHON_USEDEP}]