commit: 8a65aae9dcc75e971737433d3080d67006cb0987 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Nov 23 10:05:22 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Nov 23 10:08:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a65aae9
dev-python/oslo-utils: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/oslo-utils/Manifest | 1 - .../files/oslo-utils-7.3.0-netaddr-1.patch | 37 ------------- dev-python/oslo-utils/oslo-utils-7.3.0-r1.ebuild | 60 ---------------------- 3 files changed, 98 deletions(-) diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest index 5f6dd77490e5..7f8ef96a09c6 100644 --- a/dev-python/oslo-utils/Manifest +++ b/dev-python/oslo-utils/Manifest @@ -1,2 +1 @@ -DIST oslo.utils-7.3.0.tar.gz 132561 BLAKE2B 98533d7b4e3111a548bfab4cb97854acb4485d84d89eed40fec713fcb14a63deedbf5c019f4ed44d9be535034f3323e96b9b9f5d30467899ea8cd1bdc217200b SHA512 71dcf6fe25cc4c0a2580c32b4a4ceaa22fa1046f84bebc2cbf2c3148379b569638c2e2cce3b7a9bb1bbb87660034baa199bd4a831baa4608ef2f4bbc1d39edb6 DIST oslo.utils-7.4.0.tar.gz 135993 BLAKE2B 39e23fd850756ff4336d579ca9e3d1ca15de8370298b8bcba6adfc4dc4227c5e8d154347b5f8272ffe7b3f737317fae20f46fc6431cc5d1307b7b2a8d6d51f85 SHA512 b743778529c4da4889737aa249102dd6d7215ce7e794bfb8fb8a48fc448fe34d6a091a8afb551b46b53e2556015bf51ac75d12955a6582972bc7355b68a8799f diff --git a/dev-python/oslo-utils/files/oslo-utils-7.3.0-netaddr-1.patch b/dev-python/oslo-utils/files/oslo-utils-7.3.0-netaddr-1.patch deleted file mode 100644 index 93c9a0bc015a..000000000000 --- a/dev-python/oslo-utils/files/oslo-utils-7.3.0-netaddr-1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 20983093b42bf5a9c43f8fa5d23784d26ccbd7b7 Mon Sep 17 00:00:00 2001 -From: Takashi Kajinami <kajina...@oss.nttdata.com> -Date: Mon, 7 Oct 2024 11:06:26 +0900 -Subject: [PATCH] Fix compatibility with netaddr 1.1.0 - -Fix a few different behaviors detected in unit tests. - -Closes-Bug: #2054134 -Change-Id: I34f29d983fccc10cc4994fb23527a6dd0eac2b83 ---- - oslo_utils/netutils.py | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/oslo_utils/netutils.py b/oslo_utils/netutils.py -index 6e4c54c1..405256ee 100644 ---- a/oslo_utils/netutils.py -+++ b/oslo_utils/netutils.py -@@ -101,6 +101,9 @@ def is_valid_ipv4(address, strict=None): - (``a.b.c.d``) as opposed to address format - (``a.b.c.d``, ``a.b.c``, ``a.b``, ``a``). - """ -+ if not address: -+ return False -+ - if strict is not None: - flag = INET_PTON if strict else INET_ATON - try: -@@ -228,6 +231,9 @@ def get_ipv6_addr_by_EUI64(prefix, mac): - - .. versionadded:: 1.4 - """ -+ if not isinstance(prefix, str): -+ msg = _("Prefix must be a string") -+ raise TypeError(msg) - # Check if the prefix is an IPv4 address - if is_valid_ipv4(prefix): - msg = _("Unable to generate IP address by EUI64 for IPv4 prefix") diff --git a/dev-python/oslo-utils/oslo-utils-7.3.0-r1.ebuild b/dev-python/oslo-utils/oslo-utils-7.3.0-r1.ebuild deleted file mode 100644 index fbe1cb2e185d..000000000000 --- a/dev-python/oslo-utils/oslo-utils-7.3.0-r1.ebuild +++ /dev/null @@ -1,60 +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 Utility library" -HOMEPAGE=" - https://opendev.org/openstack/oslo.utils/ - https://github.com/openstack/oslo.utils/ - https://pypi.org/project/oslo.utils/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" - -RDEPEND=" - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.10.0[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] - >=dev-python/packaging-20.4[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] - dev-python/tzdata[${PYTHON_USEDEP}] -" -# qemu needed for qemu-img -BDEPEND=" - >=dev-python/pbr-2.2.0[${PYTHON_USEDEP}] - test? ( - app-emulation/qemu - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}] - >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests unittest - -src_prepare() { - local PATCHES=( - # https://review.opendev.org/c/openstack/oslo.utils/+/931597 - "${FILESDIR}/${P}-netaddr-1.patch" - ) - - distutils-r1_src_prepare - - # require eventlet - rm oslo_utils/tests/test_eventletutils.py || die -}