From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- dev-python/argh/Manifest | 5 +- dev-python/argh/argh-0.31.2.ebuild | 33 ------ dev-python/argh/argh-0.31.3.ebuild | 2 +- dev-python/argh/files/argh-0.31.2-py313.patch | 164 -------------------------- 4 files changed, 2 insertions(+), 202 deletions(-) delete mode 100644 dev-python/argh/argh-0.31.2.ebuild delete mode 100644 dev-python/argh/files/argh-0.31.2-py313.patch (limited to 'dev-python/argh') diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest index 2972b5c09c8e..fe0ee386bb09 100644 --- a/dev-python/argh/Manifest +++ b/dev-python/argh/Manifest @@ -1,6 +1,3 @@ -AUX argh-0.31.2-py313.patch 5349 BLAKE2B c94408fd5339ee79416dbdc7a680b42636a85cb1214bee5cdabd39db7479c5a7763e0efd23128ac47b882f890c89a9606bdb66a6f8b8a2b1aba31a92c7e9ac68 SHA512 72cc0e2fce6d4801344026177fe94af00ee872799c5b78026e255ef4560b83231630cb5cfa38d47be33d5666a37aff36b72c2ed923b1b4b6d9ca12e75e882eb9 -DIST argh-0.31.2.tar.gz 57200 BLAKE2B e5ba440d08d8f5655d237d61ab65fef02296d28d0562945e56dfa6598deafa6cc288d88e625c4acabfa2eeda359f970679db1e7424d77e0278b65fbe15c8b499 SHA512 2e0d926cae88d6830706f631aa2220654777dcc1a4263af889064d4c805616fce368c90e871a393490b9590f82759f56b2434afeba468e7720f99d85c8b75dd1 DIST argh-0.31.3.tar.gz 57570 BLAKE2B cb88813701f42657a8e89cab46be367c751ae59cc05d5eba9cebd77d375a73413b33e76d48bf84b42559fcf25f3d4b87473b124346fd4f3ba5433e60204b06a1 SHA512 c3335f975e612332ee9e3479f4517f356bacaad77f0df1e8660d5306257a8e32b139cdaa49c2c4bfa234f32e39e324182de997313c43ea4f45f2e11de7e2a24c -EBUILD argh-0.31.2.ebuild 697 BLAKE2B f0bd982ecca81bc5fd86f67d836a00875d31d16a6f7a4ac44f23e2389e87b2cd76035d83461980cdb975a8b4fff1e8fdf73845fadcf6338631ae724f571a01cd SHA512 0a08705bf387218e0799c889e85745060f3f879b8d67284c6e03131e2559a651abc23b7136996d34a1569eab8f0efe96b789a1ceec07c3ca0b2bf010b6933875 -EBUILD argh-0.31.3.ebuild 576 BLAKE2B 9781da1c8dfbb789b63782d354fd23b82489c07d09b6ddbc0c86d006b37953f505533ec9f637d0336c507d1961fba765b9df734c0ba6346f61dab82cb58846c9 SHA512 0634d28a78f11a4918edc6a1ef4363bc8a78298bbd7aea920fc8772d7387eaacc0ef78b4f3747e3d1cd48e124e8e7db43bf0778b0ed68625daa57abef591c43d +EBUILD argh-0.31.3.ebuild 568 BLAKE2B cad37566f701494a396d011a54e7cd3efe7537a427eaed8a3a5f81e10f0f4bb6da2cb445c49d3df7dd1a62db9aa1037ab2dbcf618b64c2f02d583d842eaea948 SHA512 933f4c25b82b4f751611eac51991b36aa84a5a2a4053133e08ebb22a5b83617ceaa1a2bcc0feab25ca36d6d446f0c159bf8455d7f9f388b23c54d2ff1d5dd515 MISC metadata.xml 385 BLAKE2B e1fc25e92c45fbd0183634cc645085fef5223a59975a5000557c1a2ef497c6f9ce017e462a9a881e61b4578c90859f51e5471d197ea884b7dc4ce90786a0987a SHA512 97719df6c0b48c7348bf25de9016dd1de373d6b9e1fd7f52d87eb6e0935608719c726aa3f4ca4aba8fa1211d1234c2b959dd821d241cd65b6cb47b1a06481df6 diff --git a/dev-python/argh/argh-0.31.2.ebuild b/dev-python/argh/argh-0.31.2.ebuild deleted file mode 100644 index 0c53e95bef20..000000000000 --- a/dev-python/argh/argh-0.31.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="A simple argparse wrapper" -HOMEPAGE=" - https://pythonhosted.org/argh/ - https://github.com/neithere/argh/ - https://pypi.org/project/argh/ -" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86" - -BDEPEND=" - test? ( - dev-python/iocapture[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -PATCHES=( - # https://github.com/neithere/argh/commit/cdb70d5ac7d8a5a5dff3c55100e5f67b68b26826 - "${FILESDIR}/${P}-py313.patch" -) diff --git a/dev-python/argh/argh-0.31.3.ebuild b/dev-python/argh/argh-0.31.3.ebuild index 65df10cd74ac..78f47805a77e 100644 --- a/dev-python/argh/argh-0.31.3.ebuild +++ b/dev-python/argh/argh-0.31.3.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86" BDEPEND=" test? ( diff --git a/dev-python/argh/files/argh-0.31.2-py313.patch b/dev-python/argh/files/argh-0.31.2-py313.patch deleted file mode 100644 index 4049fedc0d0d..000000000000 --- a/dev-python/argh/files/argh-0.31.2-py313.patch +++ /dev/null @@ -1,164 +0,0 @@ -From cdb70d5ac7d8a5a5dff3c55100e5f67b68b26826 Mon Sep 17 00:00:00 2001 -From: Andy Mikhaylenko -Date: Sun, 16 Jun 2024 22:38:21 +0200 -Subject: [PATCH] fix: tests under Python 3.13 (fixes #228) - -diff --git a/tests/test_integration.py b/tests/test_integration.py -index f863386..258a148 100644 ---- a/tests/test_integration.py -+++ b/tests/test_integration.py -@@ -724,18 +724,34 @@ def remind( - help_normalised = re.sub(r"\s+", " ", parser.format_help()) - - assert "name 'Basil'" in help_normalised -- assert "-t TASK, --task TASK 'hang the Moose'" in help_normalised -- assert ( -- "-r REASON, --reason REASON 'there are creatures living in it'" -- in help_normalised -- ) - -- # explicit help message is not obscured by the implicit one -- # but is still present -- assert ( -- "-n NOTE, --note NOTE why is it a remarkable animal? " -- "(default: 'it can speak English')" -- ) in help_normalised -+ # argh#228 — argparse in Python before 3.13 duplicated the placeholder in help -+ if sys.version_info < (3, 13): -+ assert "-t TASK, --task TASK 'hang the Moose'" in help_normalised -+ assert ( -+ "-r REASON, --reason REASON 'there are creatures living in it'" -+ in help_normalised -+ ) -+ -+ # explicit help message is not obscured by the implicit one -+ # but is still present -+ assert ( -+ "-n NOTE, --note NOTE why is it a remarkable animal? " -+ "(default: 'it can speak English')" -+ ) in help_normalised -+ else: -+ assert "-t, --task TASK 'hang the Moose'" in help_normalised -+ assert ( -+ "-r, --reason REASON 'there are creatures living in it'" -+ in help_normalised -+ ) -+ -+ # explicit help message is not obscured by the implicit one -+ # but is still present -+ assert ( -+ "-n, --note NOTE why is it a remarkable animal? " -+ "(default: 'it can speak English')" -+ ) in help_normalised - - - def test_default_arg_values_in_help__regression(): -@@ -750,9 +766,16 @@ def foo(*, bar=""): - # doesn't break - parser.format_help() - -+ # argh#228 — argparse in Python before 3.13 duplicated the placeholder in help -+ if sys.version_info < (3, 13): -+ expected_line = "-b BAR, --bar BAR ''" -+ # note the empty str repr ^^^ -+ else: -+ expected_line = "-b, --bar BAR ''" -+ # note the empty str repr ^^^ -+ - # now check details -- assert "-b BAR, --bar BAR ''" in parser.format_help() -- # note the empty str repr ^^^ -+ assert expected_line in parser.format_help() - - - def test_help_formatting_is_preserved(): -@@ -868,6 +891,19 @@ def second_func(): - - run(parser, "first-func --help", exit=True) - captured = capsys.readouterr() -+ -+ # argh#228 — argparse in Python before 3.13 duplicated the placeholder in help -+ if sys.version_info < (3, 13): -+ arg_help_lines = ( -+ " -h, --help show this help message and exit\n" -+ " -f FOO, --foo FOO 123" -+ ) -+ else: -+ arg_help_lines = ( -+ " -h, --help show this help message and exit\n" -+ " -f, --foo FOO 123" -+ ) -+ - assert ( - captured.out - == unindent( -@@ -877,8 +913,7 @@ def second_func(): - Owl stretching time - - {HELP_OPTIONS_LABEL}: -- -h, --help show this help message and exit -- -f FOO, --foo FOO 123 -+ {arg_help_lines} - """ - )[1:] - ) -@@ -997,6 +1032,19 @@ def second_func(): - - run(parser, "my-group first-func --help", exit=True) - captured = capsys.readouterr() -+ -+ # argh#228 — argparse in Python before 3.13 duplicated the placeholder in help -+ if sys.version_info < (3, 13): -+ arg_help_lines = ( -+ " -h, --help show this help message and exit\n" -+ " -f FOO, --foo FOO 123" -+ ) -+ else: -+ arg_help_lines = ( -+ " -h, --help show this help message and exit\n" -+ " -f, --foo FOO 123" -+ ) -+ - assert ( - captured.out - == unindent( -@@ -1006,8 +1054,7 @@ def second_func(): - Owl stretching time - - {HELP_OPTIONS_LABEL}: -- -h, --help show this help message and exit -- -f FOO, --foo FOO 123 -+ {arg_help_lines} - """ - )[1:] - ) -@@ -1079,6 +1126,19 @@ def second_func(): - - run(parser, "first-func --help", exit=True) - captured = capsys.readouterr() -+ -+ # argh#228 — argparse in Python before 3.13 duplicated the placeholder in help -+ if sys.version_info < (3, 13): -+ arg_help_lines = ( -+ " -h, --help show this help message and exit\n" -+ " -f FOO, --foo FOO 123" -+ ) -+ else: -+ arg_help_lines = ( -+ " -h, --help show this help message and exit\n" -+ " -f, --foo FOO 123" -+ ) -+ - assert ( - captured.out - == unindent( -@@ -1088,8 +1148,7 @@ def second_func(): - func description override - - {HELP_OPTIONS_LABEL}: -- -h, --help show this help message and exit -- -f FOO, --foo FOO 123 -+ {arg_help_lines} - """ - )[1:] - ) -- cgit v1.2.3