From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D668415817D for ; Wed, 12 Jun 2024 05:58:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30AC8E2B58; Wed, 12 Jun 2024 05:58:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B4DFE2B58 for ; Wed, 12 Jun 2024 05:58:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C3B2335DE9 for ; Wed, 12 Jun 2024 05:58:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED5E0166B for ; Wed, 12 Jun 2024 05:58:26 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1718171902.f4d57558f7662efb03f1bbbea58c18f73b6e0005.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/oslo-config/, dev-python/oslo-config/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch dev-python/oslo-config/oslo-config-9.4.0.ebuild X-VCS-Directories: dev-python/oslo-config/files/ dev-python/oslo-config/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f4d57558f7662efb03f1bbbea58c18f73b6e0005 X-VCS-Branch: master Date: Wed, 12 Jun 2024 05:58:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3fc7f1cb-e7ed-4f92-9f9e-b0a300281c91 X-Archives-Hash: 66a7cc5f265a46ec0c36b46031d8d042 commit: f4d57558f7662efb03f1bbbea58c18f73b6e0005 Author: Michał Górny gentoo org> AuthorDate: Wed Jun 12 05:51:16 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jun 12 05:58:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d57558 dev-python/oslo-config: Enable py3.13 Signed-off-by: Michał Górny gentoo.org> .../files/oslo-config-9.4.0-py313.patch | 42 ++++++++++++++++++++++ dev-python/oslo-config/oslo-config-9.4.0.ebuild | 7 +++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch b/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch new file mode 100644 index 000000000000..b3e6979f9e4f --- /dev/null +++ b/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch @@ -0,0 +1,42 @@ +From 4f916edb457eb02bede0a7c4a64741ef13709af7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 12 Jun 2024 07:47:18 +0200 +Subject: [PATCH] Fix tests for Python 3.13 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix expected argparse --help output to account for changes in Python +3.13. + +Closes-Bug: 2069108 +Change-Id: Ie221e5f5b369930f015a74998f50ddb473b53b94 +Signed-off-by: Michał Górny +--- + oslo_config/tests/test_cfg.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py +index 926eb8c..f69f7a0 100644 +--- a/oslo_config/tests/test_cfg.py ++++ b/oslo_config/tests/test_cfg.py +@@ -264,8 +264,14 @@ class HelpTestCase(BaseTestCase): + self.conf.register_cli_opt(uvw) + self.conf([]) + self.conf.print_help(file=f) +- self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC', f.getvalue()) +- self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW', f.getvalue()) ++ if sys.version_info >= (3, 13): ++ self.assertIn('--a-bc, --d-ef, --d_ef A_BC', f.getvalue()) ++ self.assertIn('--u-vw, --x-yz, --x_yz U_VW', f.getvalue()) ++ else: ++ self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC', ++ f.getvalue()) ++ self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW', ++ f.getvalue()) + + + class FindConfigFilesTestCase(BaseTestCase): +-- +2.45.2 + diff --git a/dev-python/oslo-config/oslo-config-9.4.0.ebuild b/dev-python/oslo-config/oslo-config-9.4.0.ebuild index 8a5bbb36170a..69c20f0f2f3d 100644 --- a/dev-python/oslo-config/oslo-config-9.4.0.ebuild +++ b/dev-python/oslo-config/oslo-config-9.4.0.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 PYPI_PN=${PN/-/.} -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 pypi @@ -46,6 +46,11 @@ BDEPEND=" distutils_enable_tests unittest src_prepare() { + local PATCHES=( + # https://review.opendev.org/c/openstack/oslo.log/+/921797 + "${FILESDIR}/${P}-py313.patch" + ) + # broken by some dep upgrade sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \ oslo_config/tests/test_cfg.py || die