commit: 4ddeb4e6e28606ef94d00c930552770222adcee0 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Aug 3 06:27:51 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Aug 3 06:27:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ddeb4e6
dev-python/oslo-log: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/oslo-log/Manifest | 2 - .../oslo-log/files/oslo-log-6.0.0-py313.patch | 80 ---------------------- dev-python/oslo-log/oslo-log-6.0.0.ebuild | 58 ---------------- dev-python/oslo-log/oslo-log-6.1.0.ebuild | 57 --------------- 4 files changed, 197 deletions(-) diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest index 87abf20528f9..cefdf3cec287 100644 --- a/dev-python/oslo-log/Manifest +++ b/dev-python/oslo-log/Manifest @@ -1,3 +1 @@ -DIST oslo.log-6.0.0.tar.gz 95271 BLAKE2B 13967ea4eeb2ad227d5534027c3a424b0f142ea334a701537ea31341a2a5166fd9c7991206e589be4d3378371bc21331027010005f36d63a13c4d59cd362c308 SHA512 87ab8e5da0f57675095734d62f7d46908c55528f89d118de6c15c3e483a15e2f20cace46d9eb2766dd617d40cc45027faee89edd2c1ef881629237b8b63513f8 -DIST oslo.log-6.1.0.tar.gz 95741 BLAKE2B 9c5c073b19d5fa0d84f19967a67cc0164470cb5fdf596b73d7017f47b2154228e21ec03d71ac84c1e161ad0aee4013795de7ab405a808cc3ceb9f3b4a64a0474 SHA512 d7329d8fbc46aa5c2b463e40f7b284657dbac773f338a4d96016c7e04998800dfb6df5c1c240454e45786f285d6093f6ec0b66b3bda9eacce39b4c6c54cae306 DIST oslo.log-6.1.1.tar.gz 95558 BLAKE2B 04897e2f568dc634ee49a0980aa19ebd967dfb758840bdf3029c52d00481492ee43b7dc93a427de2c61edf8ef2f7819344263c282068acec835ea8c669d9e0a0 SHA512 2e5692dd3b59711139a3e049e5f167c456a6779f6eacb540d70ae7f2347062d6d635e5f9fa893919205b842958bcb3767e8a644466b06928623f8a569f2274e8 diff --git a/dev-python/oslo-log/files/oslo-log-6.0.0-py313.patch b/dev-python/oslo-log/files/oslo-log-6.0.0-py313.patch deleted file mode 100644 index b80e29550854..000000000000 --- a/dev-python/oslo-log/files/oslo-log-6.0.0-py313.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 60c39a3b874f027f690b49c987daa31c37bfb0e6 Mon Sep 17 00:00:00 2001 -From: Michał Górny <[email protected]> -Date: Tue, 11 Jun 2024 21:35:58 +0200 -Subject: [PATCH] Replace deprecated logging.warn() calls with logging.warning() - -Replace the deprecated logging.warn() calls with logging.warning(). -The former were undocumented, deprecated since Python 3.3 and eventually -removed in Python 3.13. - -See: https://docs.python.org/3.13/whatsnew/3.13.html#logging -Partial-Bug: 2069084 -Change-Id: I6d1ee13409fe84cd54b7a3aa3ed862bc6e33f1c3 -Signed-off-by: Michał Górny <[email protected]> ---- - -diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py -index d17d20a..7c066ae 100644 ---- a/oslo_log/tests/unit/test_log.py -+++ b/oslo_log/tests/unit/test_log.py -@@ -1115,7 +1115,7 @@ - self.assertIn(infoexpected, self.stream.getvalue()) - self.assertEqual('\033[00;36m', infocolor) - -- self.colorlog.warn(warn_msg, context=ctxt) -+ self.colorlog.warning(warn_msg, context=ctxt) - self.assertIn(infoexpected, self.stream.getvalue()) - self.assertIn(warnexpected, self.stream.getvalue()) - self.assertEqual('\033[01;33m', warncolor) -@@ -1266,7 +1266,7 @@ - self.mylog.info(info_message, context=ctxt) - self.assertEqual(infoexpected, self.stream.getvalue()) - -- self.mylog.warn(warn_message, context=ctxt) -+ self.mylog.warning(warn_message, context=ctxt) - self.assertEqual(infoexpected + warnexpected, self.stream.getvalue()) - - def test_domain_in_log_msg(self): -@@ -1590,11 +1590,11 @@ - stream = self.set_root_stream() - log = logging.getLogger("a.a") - log.info("info") -- log.warn("warn") -+ log.warning("warn") - self.assertEqual("warn\n", stream.getvalue()) - stream = self.set_root_stream() - log.info("info") -- log.warn("warn") -+ log.warning("warn") - self.assertEqual("info\nwarn\n", stream.getvalue()) - - -From cd5eb0fdf4d74150d8e3b014ef43ad0d0cbb9a5d Mon Sep 17 00:00:00 2001 -From: Michał Górny <[email protected]> -Date: Tue, 11 Jun 2024 21:45:05 +0200 -Subject: [PATCH] Update test_rfc5424_isotime_format_no_microseconds output for py3.13 - -In Python 3.13, the isotime format does not include microseconds anymore -if they are zero. Update the test to account for both possibilities. - -Closes-Bug: 2069084 -Change-Id: I8fc022e5ad0df8ec4bd413de12106390d9dbc0f1 -Signed-off-by: Michał Górny <[email protected]> ---- - -diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py -index 7c066ae..3176c1c 100644 ---- a/oslo_log/tests/unit/test_log.py -+++ b/oslo_log/tests/unit/test_log.py -@@ -996,7 +996,10 @@ - self.config(logging_default_format_string="%(isotime)s %(message)s") - - message = "test" -- expected = "2015-12-16T13:54:26.000000+00:00 %s\n" % message -+ if sys.version_info >= (3, 13): -+ expected = "2015-12-16T13:54:26+00:00 %s\n" % message -+ else: -+ expected = "2015-12-16T13:54:26.000000+00:00 %s\n" % message - - self.log.info(message) - diff --git a/dev-python/oslo-log/oslo-log-6.0.0.ebuild b/dev-python/oslo-log/oslo-log-6.0.0.ebuild deleted file mode 100644 index 25956698161e..000000000000 --- a/dev-python/oslo-log/oslo-log-6.0.0.ebuild +++ /dev/null @@ -1,58 +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="OpenStack logging config library, configuration for all openstack projects" -HOMEPAGE=" - https://opendev.org/openstack/oslo.log/ - https://github.com/openstack/oslo.log/ - https://pypi.org/project/oslo.log/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" - -RDEPEND=" - >=dev-python/pbr-3.1.1[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-7.1.0-r1[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/pbr-3.1.1[${PYTHON_USEDEP}] - test? ( - >=dev-python/testtools-2.3.0[${PYTHON_USEDEP}] - >=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests unittest -distutils_enable_sphinx doc/source \ - dev-python/openstackdocstheme \ - dev-python/oslo-config - -PATCHES=( - # https://review.opendev.org/c/openstack/oslo.log/+/921797 - # https://review.opendev.org/c/openstack/oslo.log/+/921798 - "${FILESDIR}/${P}-py313.patch" -) - -src_test() { - # requires eventlet - rm oslo_log/tests/unit/test_pipe_mutex.py || die - - distutils-r1_src_test -} diff --git a/dev-python/oslo-log/oslo-log-6.1.0.ebuild b/dev-python/oslo-log/oslo-log-6.1.0.ebuild deleted file mode 100644 index 4cb2d5fa1887..000000000000 --- a/dev-python/oslo-log/oslo-log-6.1.0.ebuild +++ /dev/null @@ -1,57 +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="OpenStack logging config library, configuration for all openstack projects" -HOMEPAGE=" - https://opendev.org/openstack/oslo.log/ - https://github.com/openstack/oslo.log/ - https://pypi.org/project/oslo.log/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" - -RDEPEND=" - >=dev-python/pbr-3.1.1[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-7.1.0-r1[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/pbr-3.1.1[${PYTHON_USEDEP}] - test? ( - >=dev-python/testtools-2.3.0[${PYTHON_USEDEP}] - >=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests unittest -distutils_enable_sphinx doc/source \ - dev-python/openstackdocstheme \ - dev-python/oslo-config - -PATCHES=( - # https://review.opendev.org/c/openstack/oslo.log/+/921842 - "${FILESDIR}/${P}-py313.patch" -) - -src_test() { - # requires eventlet - rm oslo_log/tests/unit/test_pipe_mutex.py || die - - distutils-r1_src_test -}
