17
0

Compare commits

2 Commits

Author SHA256 Message Date
517a4f5a65 Accepting request 1321556 from devel:languages:python
OBS-URL: https://build.opensuse.org/request/show/1321556
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-ConfigArgParse?expand=0&rev=8
2025-12-09 11:49:52 +00:00
7597a0c339 - Update to 1.7.1
* The primary purpose of this release is to fix the package
    metadata on supported python versions.
- Adjust upstream source name in spec file
- Drop py313-tests.patch, fixed upstream
- Update Requires from setup.py

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ConfigArgParse?expand=0&rev=20
2025-12-08 11:41:38 +00:00
6 changed files with 18 additions and 95 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e7067471884de5478c58a511e529f0f9bd1c66bfef1dea90935438d6c23306d1
size 43817

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79c2ddae836a1e5914b71d58e4b9adbd9f7779d4e6351a637b7d2d9b6c46d3d9
size 43958

View File

@@ -11,7 +11,7 @@ is not supported by ConfigArgParse at the moment.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py
index e325afd..9718d86 100644
index e325afd1..9718d862 100644
--- a/tests/test_configargparse.py
+++ b/tests/test_configargparse.py
@@ -1533,7 +1533,8 @@ def testYAMLConfigFileParser_w_ArgumentParser_parsed_values(self):

View File

@@ -1,85 +0,0 @@
From c6a974211f1a13d492bb807ff6d07cefcc948a87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 12 Jul 2024 08:15:40 +0200
Subject: [PATCH] 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 '

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Dec 4 09:37:33 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 1.7.1
* The primary purpose of this release is to fix the package
metadata on supported python versions.
- Adjust upstream source name in spec file
- Drop py313-tests.patch, fixed upstream
- Update Requires from setup.py
-------------------------------------------------------------------
Mon May 5 13:07:22 UTC 2025 - Markéta Machová <mmachova@suse.com>

View File

@@ -18,15 +18,14 @@
%{?sle15_python_module_pythons}
Name: python-ConfigArgParse
Version: 1.7
Version: 1.7.1
Release: 0
Summary: A drop-in replacement for argparse
License: MIT
Group: Development/Languages/Python
URL: https://github.com/bw2/ConfigArgParse
Source: https://files.pythonhosted.org/packages/source/C/ConfigArgParse/ConfigArgParse-%{version}.tar.gz
Patch1: https://github.com/bw2/ConfigArgParse/pull/295/commits/c6a974211f1a13d492bb807ff6d07cefcc948a87.patch#/py313-tests.patch
Patch2: https://github.com/bw2/ConfigArgParse/pull/295/commits/5e9f442374bc6d9707a43df13aaff684dff6b535.patch#/py313-skip-exit.patch
Source: https://files.pythonhosted.org/packages/source/c/configargparse/configargparse-%{version}.tar.gz
Patch1: https://github.com/bw2/ConfigArgParse/pull/295/commits/5e9f442374bc6d9707a43df13aaff684dff6b535.patch#/py313-skip-exit.patch
BuildRequires: %{python_module PyYAML}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest}
@@ -34,7 +33,6 @@ BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-PyYAML
Requires: python-setuptools
# Old name of the package
Provides: python-configargparse = %{version}-%{release}
Obsoletes: python-configargparse < %{version}-%{release}
@@ -54,7 +52,7 @@ for config files and environment variables, so this module extends argparse to
add these features
%prep
%autosetup -p1 -n ConfigArgParse-%{version}
%autosetup -p1 -n configargparse-%{version}
%build
%pyproject_wheel