commit: d31638aa3d54c1715ee374dd5afd057332ba30eb Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Feb 28 06:06:04 2026 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Feb 28 06:38:15 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31638aa
dev-python/python-glanceclient: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/python-glanceclient/Manifest | 1 - .../python-glanceclient-4.6.0-test-py3.13.patch | 66 ---------------------- .../python-glanceclient-4.9.0.ebuild | 61 -------------------- 3 files changed, 128 deletions(-) diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest index 35e0abddc395..f966cd10a9d2 100644 --- a/dev-python/python-glanceclient/Manifest +++ b/dev-python/python-glanceclient/Manifest @@ -1,2 +1 @@ DIST python_glanceclient-4.10.0.tar.gz 210540 BLAKE2B ac725a3c2f786d1792a13d5fd3e33060d3b5e64e23550e9457938899d7515d9482b02ab3e3e8a7c4efae5ab90a35dde72e2a25efd626c1fa99b8801799b4cdef SHA512 1a8fe169c5cb1431909f96ae467d179f357575f4cdf0831c8bc3fd20ae4885f6d42e30dcf620f3ce16f47b0f52fc9205d475ae5911349cfdfbe44067c1335ede -DIST python_glanceclient-4.9.0.tar.gz 208601 BLAKE2B 5a66cb7c49eefebbd46737c373e5397557e97a19c72653c8da176cd0c46576c14fa9ed2803148ee71cfee0203e9e0ef29f831e17b3ee080c4f74280d4cb20dee SHA512 f3e04de7b2cc424344f4778a202cde3a2aae72bcc792beff1efd4cf9636289153b4dc5b90ed177cdda246b3413a4ed8a6b82197a134f26d25a71027ca3eb2dcc diff --git a/dev-python/python-glanceclient/files/python-glanceclient-4.6.0-test-py3.13.patch b/dev-python/python-glanceclient/files/python-glanceclient-4.6.0-test-py3.13.patch deleted file mode 100644 index b1760f8b87af..000000000000 --- a/dev-python/python-glanceclient/files/python-glanceclient-4.6.0-test-py3.13.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 6aa007080e1db0f95b04824f42a6b52cbd5ff886 Mon Sep 17 00:00:00 2001 -From: Petr Vaněk <[email protected]> -Date: Mon, 08 Jul 2024 12:01:15 +0200 -Subject: [PATCH] Python 3.13 test fixes - -Python 3.13 newly calls close in mock_open [1], which makes two -_cache_schemas related tests fail because they expect different amount -of mock_calls. This fix makes the expected check results conditional -based on python version. - -[1] https://github.com/python/cpython/commit/3f7c0810f6158a7ff37be432f8d7f9511427489f - -Change-Id: I8b019f73fe3a9f28f114c95321a1da0feadf750f - -Upstream-PR: https://review.opendev.org/c/openstack/python-glanceclient/+/923628 - -diff --git a/glanceclient/tests/unit/test_shell.py b/glanceclient/tests/unit/test_shell.py -index 4a123ab..ea835c4 100644 ---- a/glanceclient/tests/unit/test_shell.py -+++ b/glanceclient/tests/unit/test_shell.py -@@ -786,14 +786,19 @@ class ShellCacheSchemaTest(testutils.TestCase): - client = self.shell._get_versioned_client('2', args) - self.shell._cache_schemas(args, client, home_dir=self.cache_dir) - -- self.assertEqual(12, open.mock_calls.__len__()) -+ # see https://github.com/python/cpython/commit/3f7c0810f6158a7ff37be432f8d7f9511427489f -+ expected_count = 12 if sys.version_info < (3, 13) else 15 -+ open_idx = 4 if sys.version_info < (3, 13) else 5 -+ write_idx = 6 if sys.version_info < (3, 13) else 7 -+ -+ self.assertEqual(expected_count, open.mock_calls.__len__()) - self.assertEqual(mock.call(self.cache_files[0], 'w'), - open.mock_calls[0]) - self.assertEqual(mock.call(self.cache_files[1], 'w'), -- open.mock_calls[4]) -+ open.mock_calls[open_idx]) - actual = json.loads(open.mock_calls[2][1][0]) - self.assertEqual(schema_odict, actual) -- actual = json.loads(open.mock_calls[6][1][0]) -+ actual = json.loads(open.mock_calls[write_idx][1][0]) - self.assertEqual(schema_odict, actual) - - @mock.patch('builtins.open', new=mock.mock_open(), create=True) -@@ -809,14 +814,19 @@ class ShellCacheSchemaTest(testutils.TestCase): - client = self.shell._get_versioned_client('2', args) - self.shell._cache_schemas(args, client, home_dir=self.cache_dir) - -- self.assertEqual(12, open.mock_calls.__len__()) -+ # see https://github.com/python/cpython/commit/3f7c0810f6158a7ff37be432f8d7f9511427489f -+ expected_count = 12 if sys.version_info < (3, 13) else 15 -+ open_idx = 4 if sys.version_info < (3, 13) else 5 -+ write_idx = 6 if sys.version_info < (3, 13) else 7 -+ -+ self.assertEqual(expected_count, open.mock_calls.__len__()) - self.assertEqual(mock.call(self.cache_files[0], 'w'), - open.mock_calls[0]) - self.assertEqual(mock.call(self.cache_files[1], 'w'), -- open.mock_calls[4]) -+ open.mock_calls[open_idx]) - actual = json.loads(open.mock_calls[2][1][0]) - self.assertEqual(schema_odict, actual) -- actual = json.loads(open.mock_calls[6][1][0]) -+ actual = json.loads(open.mock_calls[write_idx][1][0]) - self.assertEqual(schema_odict, actual) - - @mock.patch('builtins.open', new=mock.mock_open(), create=True) diff --git a/dev-python/python-glanceclient/python-glanceclient-4.9.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.9.0.ebuild deleted file mode 100644 index ea035fe9b557..000000000000 --- a/dev-python/python-glanceclient/python-glanceclient-4.9.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{12..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="A client for the OpenStack Glance API" -HOMEPAGE=" - https://opendev.org/openstack/python-glanceclient/ - https://github.com/openstack/python-glanceclient/ - https://pypi.org/project/python-glanceclient/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" - -RDEPEND=" - >=dev-python/keystoneauth1-3.6.2[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >dev-python/pbr-2.1.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] - >=dev-python/warlock-1.2.0[${PYTHON_USEDEP}] - >=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}] -" -BDEPEND=" - >dev-python/pbr-2.1.0[${PYTHON_USEDEP}] - test? ( - dev-python/ddt[${PYTHON_USEDEP}] - dev-python/fixtures[${PYTHON_USEDEP}] - dev-python/requests-mock[${PYTHON_USEDEP}] - dev-python/tempest[${PYTHON_USEDEP}] - dev-python/testscenarios[${PYTHON_USEDEP}] - dev-python/testtools[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests unittest - -PATCHES=( - # combined patch for urllib3-2 and py3.12 test failures - # https://bugs.launchpad.net/python-glanceclient/+bug/2069684 - # https://bugs.launchpad.net/python-glanceclient/+bug/2069682 - "${FILESDIR}/${PN}-4.6.0-test.patch" - - # py3.13 added close() to mock_open calls - # https://review.opendev.org/c/openstack/python-glanceclient/+/923628 - "${FILESDIR}/${PN}-4.6.0-test-py3.13.patch" -) - -python_test() { - # functional tests require cloud instance access - eunittest -b glanceclient/tests/unit -}
