diff options
Diffstat (limited to 'dev-python/oslo-log')
| -rw-r--r-- | dev-python/oslo-log/Manifest | 8 | ||||
| -rw-r--r-- | dev-python/oslo-log/files/oslo-log-6.0.0-py313.patch | 80 | ||||
| -rw-r--r-- | dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch | 25 | ||||
| -rw-r--r-- | dev-python/oslo-log/oslo-log-6.1.1.ebuild (renamed from dev-python/oslo-log/oslo-log-6.0.0.ebuild) | 5 | ||||
| -rw-r--r-- | dev-python/oslo-log/oslo-log-6.1.2.ebuild | 52 |
5 files changed, 84 insertions, 86 deletions
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest index 81e65a0efce1..7d207f0aac3a 100644 --- a/dev-python/oslo-log/Manifest +++ b/dev-python/oslo-log/Manifest @@ -1,4 +1,6 @@ -AUX oslo-log-6.0.0-py313.patch 3136 BLAKE2B 383cd50ad54458e949d2cd5da045675ce4358463037d4befc9feb5ffa4bd6b2f5b4e8eef27699579ccab8b10081413dc7b4c7aeb5d2eda518ddf8cc499423112 SHA512 27934d951588a6f80ce6ab6dd1056e49b034f04b2a42bfe8b710b3261cc6814641b46ebcb9a77d04f66ae9ff96827552f8a91c6bbef22a3117401ede5127f415 -DIST oslo.log-6.0.0.tar.gz 95271 BLAKE2B 13967ea4eeb2ad227d5534027c3a424b0f142ea334a701537ea31341a2a5166fd9c7991206e589be4d3378371bc21331027010005f36d63a13c4d59cd362c308 SHA512 87ab8e5da0f57675095734d62f7d46908c55528f89d118de6c15c3e483a15e2f20cace46d9eb2766dd617d40cc45027faee89edd2c1ef881629237b8b63513f8 -EBUILD oslo-log-6.0.0.ebuild 1519 BLAKE2B 06f0bc82c50bc71be98bf9cb0611ebce4cd27a591e3759a700ca3fdf94b42cc5da671363bd19d63cdebf72e86635eb4f56fefeecd0887bce71c6c513beb8432a SHA512 2d547adb582c8a8ec188331c5c6465566094e34706f1e40a0ef7154f126f82ddabb2e81cbce529c57d0d71c6b08a38098e111d2365fe5234521d065d0d08069d +AUX oslo-log-6.1.0-py313.patch 1154 BLAKE2B d43a43de9f9053ac1cee4c3db4946f73a76d6890c9ac90ef78ec2f66c2db164aff91c423151f05c7897773d2ffc68387d84d2cd771b2daec22ca722d10e73134 SHA512 8b9d621eebb9a0e53817a3d4a8905c3730f1d7fc9cc326358367ec7014be105bd8003152d1bc87e9a5f2eca91da804069a0f632b3db6b6d0ff13995bca11e22a +DIST oslo.log-6.1.1.tar.gz 95558 BLAKE2B 04897e2f568dc634ee49a0980aa19ebd967dfb758840bdf3029c52d00481492ee43b7dc93a427de2c61edf8ef2f7819344263c282068acec835ea8c669d9e0a0 SHA512 2e5692dd3b59711139a3e049e5f167c456a6779f6eacb540d70ae7f2347062d6d635e5f9fa893919205b842958bcb3767e8a644466b06928623f8a569f2274e8 +DIST oslo.log-6.1.2.tar.gz 95653 BLAKE2B 2cbac1274b8409faeefe2dc1d070acb264a9f1089369eb11bd16dd2f62d978f060c4845b76e38fb9c18cd832d06f18ecfc60098adc28cd98693271d1584b1816 SHA512 5eaf8ac49a7658e60116cea20207687050c911e2d93361942fd33d4bc321f67e4cb48d47e15faba95e0e31f945b5d6b46442ae8b2d39c8603879677e8f2dad09 +EBUILD oslo-log-6.1.1.ebuild 1466 BLAKE2B 17c71332eacafeee33cfaa6052bc441c30e9f5df20c161acf38f6117e7c458e1182ebea6b51ab367e249ffe527014f289c30dc036cdb597cfab455c81779e8c9 SHA512 dad74b199cf34538adbd7c78370b6249cf55fa29d374c08b6a7f2db5a1e457384a4156d38e4c6e1fd5c47c864c4d789f873358d45172df20317a10cbc71d4a57 +EBUILD oslo-log-6.1.2.ebuild 1357 BLAKE2B a429d40adb1544469364dbe24ee737547f66a60680e35b398ad8c346ef59217031a905a8cdb7c57ffb39725d505f18c011e65b2a9f95d582d9a47a007c243f5c SHA512 6e3b3ab40612857423a4f5a13a03513ae276baec5f19c3d337223b2b261dee02b21638296a3395ac1e7ae99b9a0a70c9dca9363018d5ef58840690b317c2d6fe MISC metadata.xml 914 BLAKE2B 47a0937cefc2cc4c8c4300f4aae699a42c5d659cb6017aa01b87aca14bdcb9f47256c3417cc0178999c452a35ebccd915b020b537a4d688d1d00664b7be1332d SHA512 dfeb43d43608a56c60e62046f1fbef6c6cc794431917d7734caf0b3afb5d1b761c1a04ee01ab0fc4d6051c39a984d6edb25663dae2cf94354192d5f2b8abd6e7 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 <mgorny@gentoo.org> -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 <mgorny@gentoo.org> ---- - -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 <mgorny@gentoo.org> -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 <mgorny@gentoo.org> ---- - -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/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.0.0.ebuild b/dev-python/oslo-log/oslo-log-6.1.1.ebuild index 25956698161e..0715254b3851 100644 --- a/dev-python/oslo-log/oslo-log-6.0.0.ebuild +++ b/dev-python/oslo-log/oslo-log-6.1.1.ebuild @@ -45,9 +45,8 @@ distutils_enable_sphinx doc/source \ 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" + # https://review.opendev.org/c/openstack/oslo.log/+/921842 + "${FILESDIR}/${PN}-6.1.0-py313.patch" ) src_test() { diff --git a/dev-python/oslo-log/oslo-log-6.1.2.ebuild b/dev-python/oslo-log/oslo-log-6.1.2.ebuild new file mode 100644 index 000000000000..771fcebe9837 --- /dev/null +++ b/dev-python/oslo-log/oslo-log-6.1.2.ebuild @@ -0,0 +1,52 @@ +# 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 + +src_test() { + # requires eventlet + rm oslo_log/tests/unit/test_pipe_mutex.py || die + + distutils-r1_src_test +} |