From 71dd9d29cdaf7cc0ecdb9ea37d128726a941c630 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Nov 2024 03:02:57 +0000 Subject: gentoo auto-resync : 23:11:2024 - 03:02:56 --- .../ConfigArgParse/ConfigArgParse-1.7.ebuild | 40 -------- dev-python/ConfigArgParse/Manifest | 4 - .../files/ConfigArgParse-1.7-py313.patch | 112 --------------------- dev-python/ConfigArgParse/metadata.xml | 13 --- 4 files changed, 169 deletions(-) delete mode 100644 dev-python/ConfigArgParse/ConfigArgParse-1.7.ebuild delete mode 100644 dev-python/ConfigArgParse/Manifest delete mode 100644 dev-python/ConfigArgParse/files/ConfigArgParse-1.7-py313.patch delete mode 100644 dev-python/ConfigArgParse/metadata.xml (limited to 'dev-python/ConfigArgParse') diff --git a/dev-python/ConfigArgParse/ConfigArgParse-1.7.ebuild b/dev-python/ConfigArgParse/ConfigArgParse-1.7.ebuild deleted file mode 100644 index a7a4fe4258d7..000000000000 --- a/dev-python/ConfigArgParse/ConfigArgParse-1.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables" -HOMEPAGE=" - https://github.com/bw2/ConfigArgParse/ - https://pypi.org/project/ConfigArgParse/" -SRC_URI=" - https://github.com/bw2/ConfigArgParse/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" - -BDEPEND=" - test? ( - dev-python/pyyaml[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests unittest - -PATCHES=( - # https://github.com/bw2/ConfigArgParse/pull/295 - "${FILESDIR}/${P}-py313.patch" -) - -src_test() { - local -x COLUMNS=80 - distutils-r1_src_test -} diff --git a/dev-python/ConfigArgParse/Manifest b/dev-python/ConfigArgParse/Manifest deleted file mode 100644 index 57dfa75d16ca..000000000000 --- a/dev-python/ConfigArgParse/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX ConfigArgParse-1.7-py313.patch 5717 BLAKE2B 9a3bc91ccc2c0f316ba37cc24299aec40aed2d91f1f8185cacc90356af477aab1b04f5ef57885fb221af6f1dbed82c1ddb2d26c4d4b7da94554fbfabb8acc072 SHA512 4ccce5af6aede68c13ff598e32b82397289a5877b070488681314873fc9f540247265cbb4da30f8dafa1a08bbca5a8a204124b1741d7ffbddf25015e5edc0c6a -DIST ConfigArgParse-1.7.gh.tar.gz 37462 BLAKE2B a351830f79899910039cfee7a830af58afb2534368b53e8f821c161444d81e2eac61ebf7a10ce1c4a6586f05db5fb0277fdc5c0605c0e517f9592bb9a66e2f45 SHA512 4c388768dfda861a58a8c7b5a4de2a7c4070d445d9ea9aaeb5ce2e5af954ed6422b5af33967d086fd4c477156ef89e3dfd1406c02f0c49bafe6a9c980bf5840f -EBUILD ConfigArgParse-1.7.ebuild 798 BLAKE2B 19416d01c5f5a54b5b314b36193c36fb88dfdaae3780ddce7f47fc930749793baac7bf2ae6cbc6ae21fe5fc440664d6bd0e956be38518c25aa64ad5fe4cde214 SHA512 767d9972fd5abfbc45e3332a7a175ba068b46edd17e55d96be58f4aaad896b1d03cd90328c20723a07b72f571c475938493893ad84ab143164d82bab22006221 -MISC metadata.xml 413 BLAKE2B 06bc019926862278b7c7a0f602f737f0ee20df1271bfd4ccd2e96e602b537403ae641f4196496ed0af92830a457af330def85f4d4b30ae2733510b82c0589310 SHA512 df63096d97d9835ee72b03ee144cb1cbed4f29644380c8711718b570938e0ed1dff9bca15b77c91df052f3f68e10633d1880d553cb8c8d7e1827714355dd8593 diff --git a/dev-python/ConfigArgParse/files/ConfigArgParse-1.7-py313.patch b/dev-python/ConfigArgParse/files/ConfigArgParse-1.7-py313.patch deleted file mode 100644 index a079f37a18e6..000000000000 --- a/dev-python/ConfigArgParse/files/ConfigArgParse-1.7-py313.patch +++ /dev/null @@ -1,112 +0,0 @@ -From c6a974211f1a13d492bb807ff6d07cefcc948a87 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 12 Jul 2024 08:15:40 +0200 -Subject: [PATCH 1/2] update test expectations for Python 3.13 - -Python 3.13 no longer repeats the placeholder for options with multiple -aliases in the help message. For example, rather than: - - -c CONFIG_FILE, --config CONFIG_FILE - -it now outputs: - - -c, --config CONFIG_FILE - -Update the regular expressions to account for both possibilities. - -Fixes #294 ---- - tests/test_configargparse.py | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py -index 288e082..e325afd 100644 ---- a/tests/test_configargparse.py -+++ b/tests/test_configargparse.py -@@ -271,9 +271,9 @@ def testBasicCase2(self, use_groups=False): - ' -h, --help \\s+ show this help message and exit\n' - ' --genome GENOME \\s+ Path to genome file\n' - ' -v\n' -- ' -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n' -- ' -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' -- ' -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + -+ ' -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n' -+ ' -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' -+ ' -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + - 7*r'(.+\s*)') - else: - self.assertRegex(self.format_help(), -@@ -286,10 +286,10 @@ def testBasicCase2(self, use_groups=False): - 'g1:\n' - ' --genome GENOME \\s+ Path to genome file\n' - ' -v\n' -- ' -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n\n' -+ ' -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n\n' - 'g2:\n' -- ' -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' -- ' -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + -+ ' -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' -+ ' -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + - 7*r'(.+\s*)') - - self.assertParseArgsRaises("invalid choice: 'ZZZ'", -@@ -387,9 +387,9 @@ def testMutuallyExclusiveArgs(self): - ' \\s*-f2 TYPE2_CFG_FILE\\)\\s+\\(-f FRMT \\| -b\\)\n\n' - '%s:\n' - ' -h, --help show this help message and exit\n' -- ' -f1 TYPE1_CFG_FILE, --type1-cfg-file TYPE1_CFG_FILE\n' -- ' -f2 TYPE2_CFG_FILE, --type2-cfg-file TYPE2_CFG_FILE\n' -- ' -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n' -+ ' -f1( TYPE1_CFG_FILE)?, --type1-cfg-file TYPE1_CFG_FILE\n' -+ ' -f2( TYPE2_CFG_FILE)?, --type2-cfg-file TYPE2_CFG_FILE\n' -+ ' -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n' - ' -b, --bam\\s+\\[env var: BAM_FORMAT\\]\n\n' - 'group1:\n' - ' --genome GENOME Path to genome file\n' -@@ -875,7 +875,7 @@ def testConstructor_ConfigFileArgs(self): - 'usage: .* \\[-h\\] -c CONFIG_FILE --genome GENOME\n\n' - '%s:\n' - ' -h, --help\\s+ show this help message and exit\n' -- ' -c CONFIG_FILE, --config CONFIG_FILE\\s+ my config file\n' -+ ' -c( CONFIG_FILE)?, --config CONFIG_FILE\\s+ my config file\n' - ' --genome GENOME\\s+ Path to genome file\n\n'%OPTIONAL_ARGS_STRING + - 5*r'(.+\s*)') - -@@ -935,8 +935,8 @@ def test_FormatHelp(self): - r'\[-w CONFIG_OUTPUT_PATH\]\s* --arg1\s+ARG1\s*\[--flag\]\s*' - '%s:\\s*' - '-h, --help \\s* show this help message and exit ' -- r'-c CONFIG_FILE, --config CONFIG_FILE\s+my config file ' -- r'-w CONFIG_OUTPUT_PATH, --write-config CONFIG_OUTPUT_PATH takes ' -+ r'-c( CONFIG_FILE)?, --config CONFIG_FILE\s+my config file ' -+ r'-w( CONFIG_OUTPUT_PATH)?, --write-config CONFIG_OUTPUT_PATH takes ' - r'the current command line args and writes them ' - r'out to a config file at the given path, then exits ' - r'--arg1 ARG1 Arg1 help text ' - -From 5e9f442374bc6d9707a43df13aaff684dff6b535 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 12 Jul 2024 08:25:30 +0200 -Subject: [PATCH 2/2] skip exit_on_error* tests to fix 3.13 test failures - -Skip `exit_on_error*` tests from `test.test_argparse` to avoid test -failures on Python 3.13. The `exit_on_error=False` semantics -is not supported by ConfigArgParse at the moment. ---- - tests/test_configargparse.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py -index e325afd..9718d86 100644 ---- a/tests/test_configargparse.py -+++ b/tests/test_configargparse.py -@@ -1533,7 +1533,8 @@ def testYAMLConfigFileParser_w_ArgumentParser_parsed_values(self): - test_argparse_source_code = test_argparse_source_code.replace( - 'argparse.ArgumentParser', 'configargparse.ArgumentParser').replace( - 'TestHelpFormattingMetaclass', '_TestHelpFormattingMetaclass').replace( -- 'test_main', '_test_main') -+ 'test_main', '_test_main').replace( -+ 'test_exit_on_error', '_test_exit_on_error') - - # pytest tries to collect tests from TestHelpFormattingMetaclass, and - # test_main, and raises a warning when it finds it's not a test class diff --git a/dev-python/ConfigArgParse/metadata.xml b/dev-python/ConfigArgParse/metadata.xml deleted file mode 100644 index f46051e99f5b..000000000000 --- a/dev-python/ConfigArgParse/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - python@gentoo.org - Python - - - - ConfigArgParse - bw2/ConfigArgParse - - -- cgit v1.2.3