1
0

6 Commits

Author SHA256 Message Date
5c3cff44d9 Accepting request 1274651 from devel:languages:python
OBS-URL: https://build.opensuse.org/request/show/1274651
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-ConfigArgParse?expand=0&rev=7
2025-05-05 20:29:52 +00:00
2e4a34144d - Convert to pip-based build
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ConfigArgParse?expand=0&rev=18
2025-05-05 15:02:39 +00:00
4bad4c1063 Accepting request 1219174 from devel:languages:python
- add py313-skip-exit.patch, py313-tests.patch
- skip one more test

  * no upstream changelog available
  * no changes file available
  * Python 3.9 support
- Use full link to source.
- Some minor cleanups.
- Update to upstream version 0.9.3 to make mitmproxy work.
- Initial package release

OBS-URL: https://build.opensuse.org/request/show/1219174
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-ConfigArgParse?expand=0&rev=6
2024-10-30 16:36:17 +00:00
f5641ed3d2 - skip one more test
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ConfigArgParse?expand=0&rev=16
2024-10-29 20:12:38 +00:00
1adce7e712 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ConfigArgParse?expand=0&rev=15 2024-10-29 20:12:25 +00:00
c56ea9a663 - add py313-skip-exit.patch, py313-tests.patch
* no upstream changelog available
  * no changes file available
  * Python 3.9 support
- Use full link to source.
- Some minor cleanups.
- Update to upstream version 0.9.3 to make mitmproxy work.
- Initial package release

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ConfigArgParse?expand=0&rev=14
2024-10-29 20:09:54 +00:00
4 changed files with 138 additions and 13 deletions

26
py313-skip-exit.patch Normal file
View File

@@ -0,0 +1,26 @@
From 5e9f442374bc6d9707a43df13aaff684dff6b535 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:25:30 +0200
Subject: [PATCH] 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

85
py313-tests.patch Normal file
View File

@@ -0,0 +1,85 @@
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,14 @@
-------------------------------------------------------------------
Mon May 5 13:07:22 UTC 2025 - Markéta Machová <mmachova@suse.com>
- Convert to pip-based build
-------------------------------------------------------------------
Tue Oct 29 20:09:28 UTC 2024 - Dirk Müller <dmueller@suse.com>
- add py313-skip-exit.patch, py313-tests.patch
- skip one more test
-------------------------------------------------------------------
Wed Jul 26 15:58:19 UTC 2023 - Dirk Müller <dmueller@suse.com>
@@ -9,7 +20,7 @@ Wed Jul 26 15:58:19 UTC 2023 - Dirk Müller <dmueller@suse.com>
Sat Jul 1 20:41:52 UTC 2023 - Dirk Müller <dmueller@suse.com>
- update to 1.5.5:
* no upstream changelog available
* no upstream changelog available
-------------------------------------------------------------------
Mon Jun 12 05:37:34 UTC 2023 - ecsos <ecsos@opensuse.org>
@@ -32,7 +43,7 @@ Tue Jul 20 17:28:18 UTC 2021 - Matej Cepl <mcepl@suse.com>
Sun Jul 4 19:52:10 UTC 2021 - Dirk Müller <dmueller@suse.com>
- update to 1.5.1:
* no changes file available
* no changes file available
-------------------------------------------------------------------
Tue Jun 8 06:24:49 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
@@ -43,7 +54,7 @@ Tue Jun 8 06:24:49 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
Mon Mar 8 22:37:50 UTC 2021 - Dirk Müller <dmueller@suse.com>
- update to 1.3:
* Python 3.9 support
* Python 3.9 support
-------------------------------------------------------------------
Wed Jun 10 15:57:44 UTC 2020 - Matej Cepl <mcepl@suse.com>
@@ -134,21 +145,21 @@ Mon Mar 9 15:30:11 UTC 2015 - freitag@owncloud.com
- Add LICENSE file to doc section of the package
- Use python-setuptools as dependency
- Use full link to source.
- Use full link to source.
-------------------------------------------------------------------
Wed Mar 4 10:33:38 UTC 2015 - freitag@owncloud.com
- Some minor cleanups.
- Some minor cleanups.
-------------------------------------------------------------------
Wed Mar 4 09:49:46 UTC 2015 - freitag@owncloud.com
- Update to upstream version 0.9.3 to make mitmproxy work.
- Update to upstream version 0.9.3 to make mitmproxy work.
-------------------------------------------------------------------
Tue Mar 3 07:07:25 UTC 2015 - freitag@opensuse.org
- Initial package release
- Initial package release

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-ConfigArgParse
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,10 @@ 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
BuildRequires: %{python_module PyYAML}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -51,25 +54,25 @@ for config files and environment variables, so this module extends argparse to
add these features
%prep
%setup -q -n ConfigArgParse-%{version}
%autosetup -p1 -n ConfigArgParse-%{version}
%build
%python_build
%pyproject_wheel
%install
%python_install
%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
# https://github.com/bw2/ConfigArgParse/issues/146
export COLUMNS=80
%pytest -k 'not (test_main or testGlobalInstances or testGlobalInstances_WithName or testConfigOrEnvValueErrors)'
%pytest -k 'not (test_main or testGlobalInstances or testGlobalInstances_WithName or testConfigOrEnvValueErrors or testMutuallyExclusiveArgs)'
%files %{python_files}
%doc README.rst
%license LICENSE
%{python_sitelib}/configargparse*
%{python_sitelib}/ConfigArgParse-%{version}-py*.egg-info
%{python_sitelib}/[Cc]onfig[Aa]rg[Pp]arse-%{version}*info
%pycache_only %{python_sitelib}/__pycache__
%changelog