commit: be020011e63c3b8b7d0d237f5e8c6048671c8c18 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jul 20 12:28:08 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jul 20 13:27:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be020011
dev-python/oslo-config: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/oslo-config/Manifest | 1 - .../files/oslo-config-9.4.0-py313.patch | 42 --------------- dev-python/oslo-config/oslo-config-9.4.0.ebuild | 63 ---------------------- 3 files changed, 106 deletions(-) diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest index 8416938cc0eb..16dd266ea64e 100644 --- a/dev-python/oslo-config/Manifest +++ b/dev-python/oslo-config/Manifest @@ -1,2 +1 @@ -DIST oslo.config-9.4.0.tar.gz 161322 BLAKE2B 3edd3be09ebe777ebcb4cd79171bae764046f6ceb0f0c9ca8f88388f1a0bcd23d2bb4e4130ab81a7f3cf063ce0ee668ffbcd8c4bf9f633213e97dcd12e2575dd SHA512 d404876c34c82963af8b992091fd1186855b3ced9a6a574ca4fc152a5b50bfc1945aca04e163770d8bec948cb57904a83eae9e3d7c4c3b852c90987f73e66ba9 DIST oslo.config-9.5.0.tar.gz 161655 BLAKE2B 7844729658ddd13ff89b4c14983cfeeb3f6352f99a190058bd924592d9183459ea2da5caead7a77ed6c4a4e395aac2dd53f56847d81ce911ce76a04fa69f5b7d SHA512 517bb9fe416451eb791087216facd8643d77affb738aa2623817302dfc9dbd242d1aa2ba8c542fee437f91b2049129fa097fe37fec8c6a28e0092fc4d64c0c4f diff --git a/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch b/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch deleted file mode 100644 index b3e6979f9e4f..000000000000 --- a/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4f916edb457eb02bede0a7c4a64741ef13709af7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Wed, 12 Jun 2024 07:47:18 +0200 -Subject: [PATCH] Fix tests for Python 3.13 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix expected argparse --help output to account for changes in Python -3.13. - -Closes-Bug: 2069108 -Change-Id: Ie221e5f5b369930f015a74998f50ddb473b53b94 -Signed-off-by: Michał Górny <[email protected]> ---- - oslo_config/tests/test_cfg.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py -index 926eb8c..f69f7a0 100644 ---- a/oslo_config/tests/test_cfg.py -+++ b/oslo_config/tests/test_cfg.py -@@ -264,8 +264,14 @@ class HelpTestCase(BaseTestCase): - self.conf.register_cli_opt(uvw) - self.conf([]) - self.conf.print_help(file=f) -- self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC', f.getvalue()) -- self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW', f.getvalue()) -+ if sys.version_info >= (3, 13): -+ self.assertIn('--a-bc, --d-ef, --d_ef A_BC', f.getvalue()) -+ self.assertIn('--u-vw, --x-yz, --x_yz U_VW', f.getvalue()) -+ else: -+ self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC', -+ f.getvalue()) -+ self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW', -+ f.getvalue()) - - - class FindConfigFilesTestCase(BaseTestCase): --- -2.45.2 - diff --git a/dev-python/oslo-config/oslo-config-9.4.0.ebuild b/dev-python/oslo-config/oslo-config-9.4.0.ebuild deleted file mode 100644 index 69c20f0f2f3d..000000000000 --- a/dev-python/oslo-config/oslo-config-9.4.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.log/+/921797 - "${FILESDIR}/${P}-py313.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 -}
