gentoo auto-resync : 06:07:2024 - 08:06:15

3 files changed, 85 insertions, 0 deletions

diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 81e65a0efce1..2e9d69f110de 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,4 +1,7 @@
 AUX oslo-log-6.0.0-py313.patch 3136 BLAKE2B 383cd50ad54458e949d2cd5da045675ce4358463037d4befc9feb5ffa4bd6b2f5b4e8eef27699579ccab8b10081413dc7b4c7aeb5d2eda518ddf8cc499423112 SHA512 27934d951588a6f80ce6ab6dd1056e49b034f04b2a42bfe8b710b3261cc6814641b46ebcb9a77d04f66ae9ff96827552f8a91c6bbef22a3117401ede5127f415
+AUX oslo-log-6.1.0-py313.patch 1154 BLAKE2B d43a43de9f9053ac1cee4c3db4946f73a76d6890c9ac90ef78ec2f66c2db164aff91c423151f05c7897773d2ffc68387d84d2cd771b2daec22ca722d10e73134 SHA512 8b9d621eebb9a0e53817a3d4a8905c3730f1d7fc9cc326358367ec7014be105bd8003152d1bc87e9a5f2eca91da804069a0f632b3db6b6d0ff13995bca11e22a
 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
 EBUILD oslo-log-6.0.0.ebuild 1519 BLAKE2B 06f0bc82c50bc71be98bf9cb0611ebce4cd27a591e3759a700ca3fdf94b42cc5da671363bd19d63cdebf72e86635eb4f56fefeecd0887bce71c6c513beb8432a SHA512 2d547adb582c8a8ec188331c5c6465566094e34706f1e40a0ef7154f126f82ddabb2e81cbce529c57d0d71c6b08a38098e111d2365fe5234521d065d0d08069d
+EBUILD oslo-log-6.1.0.ebuild 1462 BLAKE2B 13e011527acd037a1985a53321646ab3f67ad4575fd260d38bf97faace35dd2c84d8cefd25a6e3bc5bb73f157b64f51752959c9b64bcfac93b0669bd7a9fe391 SHA512 c90c83fc8272a457fd4d7a1c693c8c62c9d2447779b3b3acef62b05440d9916aa8592c029158869f87e9d1a3af4c3885a28379dc9827c938c8a5133a14ac93a6
 MISC metadata.xml 914 BLAKE2B 47a0937cefc2cc4c8c4300f4aae699a42c5d659cb6017aa01b87aca14bdcb9f47256c3417cc0178999c452a35ebccd915b020b537a4d688d1d00664b7be1332d SHA512 dfeb43d43608a56c60e62046f1fbef6c6cc794431917d7734caf0b3afb5d1b761c1a04ee01ab0fc4d6051c39a984d6edb25663dae2cf94354192d5f2b8abd6e7
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 <mgorny@gentoo.org>
+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 <mgorny@gentoo.org>
+---
+
+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
+}