commit: 66e1a5d3adc3bbf766c2f0ef8305db7c86318790 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jul 4 11:29:00 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jul 4 12:37:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e1a5d3
dev-python/oslo-log: Bump to 6.1.0 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/oslo-log/Manifest | 1 + .../oslo-log/files/oslo-log-6.1.0-py313.patch | 25 ++++++++++ dev-python/oslo-log/oslo-log-6.1.0.ebuild | 57 ++++++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest index 4e705e3dc829..4a495df5aecd 100644 --- a/dev-python/oslo-log/Manifest +++ b/dev-python/oslo-log/Manifest @@ -1 +1,2 @@ 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 diff --git a/dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch b/dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch new file mode 100644 index 000000000000..916c6b132c2d --- /dev/null +++ b/dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch @@ -0,0 +1,25 @@ +From 1bd9d229824c16f521fb1d3ba306fe8cb2a5aada Mon Sep 17 00:00:00 2001 +From: Michał Górny <[email protected]> +Date: Wed, 12 Jun 2024 11:22:48 +0200 +Subject: [PATCH] Fix test time mocking for Python 3.13 + +Fix test_rfc5424_isotime_format_no_microseconds() to mock time.time_ns(), +logging uses that function rather than tiem.time() in logging. + +Change-Id: I0cc429e2ea8ee7fef3b0a5662d584dac65d657ad +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..0580908 100644 +--- a/oslo_log/tests/unit/test_log.py ++++ b/oslo_log/tests/unit/test_log.py +@@ -991,6 +991,8 @@ + get_fake_datetime( + datetime.datetime(2015, 12, 16, 13, 54, 26))) + @mock.patch("time.time", new=mock.Mock(return_value=1450274066.000000)) ++ @mock.patch("time.time_ns", ++ new=mock.Mock(return_value=1450274066000000000)) + @mock.patch("dateutil.tz.tzlocal", new=mock.Mock(return_value=tz.tzutc())) + def test_rfc5424_isotime_format_no_microseconds(self): + self.config(logging_default_format_string="%(isotime)s %(message)s") diff --git a/dev-python/oslo-log/oslo-log-6.1.0.ebuild b/dev-python/oslo-log/oslo-log-6.1.0.ebuild new file mode 100644 index 000000000000..4cb2d5fa1887 --- /dev/null +++ b/dev-python/oslo-log/oslo-log-6.1.0.ebuild @@ -0,0 +1,57 @@ +# 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 +}
