diff --git a/argh-0.26.2.tar.gz b/argh-0.26.2.tar.gz deleted file mode 100644 index 066137b..0000000 --- a/argh-0.26.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65 -size 32913 diff --git a/argh-0.28.1.tar.gz b/argh-0.28.1.tar.gz new file mode 100644 index 0000000..477e463 --- /dev/null +++ b/argh-0.28.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2093086f0e809a3ecc24b64a2145309ee8f56d034936cd59e57c558a357329d +size 62511 diff --git a/python-argh-no_mock.patch b/python-argh-no_mock.patch deleted file mode 100644 index c03eb3e..0000000 --- a/python-argh-no_mock.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: argh-0.26.2/setup.py -=================================================================== ---- argh-0.26.2.orig/setup.py 2016-05-11 21:05:03.000000000 +0200 -+++ argh-0.26.2/setup.py 2022-03-10 11:06:42.410811689 +0100 -@@ -82,7 +82,7 @@ setup( - install_requires = install_requires, - - # testing -- tests_require = ['pytest', 'mock', 'iocapture'], -+ tests_require = ['pytest', 'iocapture'], - cmdclass = {'test': PyTest}, - - # copyright -Index: argh-0.26.2/test/test_assembling.py -=================================================================== ---- argh-0.26.2.orig/test/test_assembling.py 2014-10-26 22:04:34.000000000 +0100 -+++ argh-0.26.2/test/test_assembling.py 2022-03-10 11:06:42.410811689 +0100 -@@ -4,7 +4,7 @@ Unit Tests For Assembling Phase - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - """ - import sys --import mock -+import unittest.mock as mock - import pytest - - import argh -Index: argh-0.26.2/test/test_dispatching.py -=================================================================== ---- argh-0.26.2.orig/test/test_dispatching.py 2015-10-13 00:25:40.000000000 +0200 -+++ argh-0.26.2/test/test_dispatching.py 2022-03-10 11:06:42.410811689 +0100 -@@ -4,7 +4,7 @@ Dispatching tests - ~~~~~~~~~~~~~~~~~ - """ - import argh --from mock import Mock, patch -+from unittest.mock import Mock, patch - import pytest - - from .base import make_IO -Index: argh-0.26.2/test/test_integration.py -=================================================================== ---- argh-0.26.2.orig/test/test_integration.py 2022-03-10 11:06:42.398811617 +0100 -+++ argh-0.26.2/test/test_integration.py 2022-03-10 11:06:42.410811689 +0100 -@@ -8,7 +8,7 @@ import re - import argparse - - import iocapture --import mock -+import unittest.mock as mock - import pytest - - import argh -Index: argh-0.26.2/test/test_interaction.py -=================================================================== ---- argh-0.26.2.orig/test/test_interaction.py 2014-01-06 07:20:25.000000000 +0100 -+++ argh-0.26.2/test/test_interaction.py 2022-03-10 11:07:05.850951267 +0100 -@@ -4,7 +4,7 @@ Interaction Tests - ~~~~~~~~~~~~~~~~~ - """ - import sys --import mock -+import unittest.mock as mock - - import argh - diff --git a/python-argh.changes b/python-argh.changes index c89f7a5..54bac06 100644 --- a/python-argh.changes +++ b/python-argh.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Fri Jun 2 07:12:44 UTC 2023 - pgajdos@suse.com + +- version update to 0.28.1 + Version 0.28.1 + -------------- + - Fixed bugs in tests (#171, #172) + Version 0.28.0 + -------------- + A major cleanup. + Backward incompatible changes: + - Dropped support for Python 2.7 and 3.7. + Deprecated features, to be removed in v.0.30: + - `argh.assembling.SUPPORTS_ALIASES`. + - Always `True` for recent versions of Python. + - `argh.io.safe_input()` AKA `argh.interaction.safe_input()`. + - Not relevant anymore. Please use the built-in `input()` instead. + - argument `pre_call` in `dispatch()`. + - Argument help as annotations. + - Annotations will only be used for types after v.0.30. + - Added deprecation warnings for some arguments deprecated back in v.0.26. + Version 0.27.2 + -------------- + Minor packaging fix: + * chore: include file required by tox.ini in the sdist (#155) + Version 0.27.1 + -------------- + Minor building and packaging fixes: + * docs: add Read the Docs config (#160) + * chore: include tox.ini in the sdist (#155) + Version 0.27.0 + -------------- + This is the last version to support Python 2.7. + Backward incompatible changes: + - Dropped support for Python 2.6. + Enhancements: + - Added support for Python 3.7 through 3.11. + - Support introspection of function signature behind the `@wraps` decorator + (issue #111). + Fixed bugs: + - When command function signature contained ``**kwargs`` *and* positionals + without defaults and with underscores in their names, a weird behaviour could + be observed (issue #104). + - Fixed introspection through decorators (issue #111). + - Switched to Python's built-in `unittest.mock` (PR #154). + - Fixed bug with `skip_unknown_args=True` (PR #134). + - Fixed tests for Python 3.9.7+ (issue #148). + Other changes: + - Included the license files in manifest (PR #112). + - Extended the list of similar projects (PR #87). + - Fixed typos and links in documentation (PR #110, #116, #156). + - Switched CI to Github Actions (PR #153). +- deleted patches + - python-argh-no_mock.patch (upstreamed) + - support-py39.patch (upstreamed) + ------------------------------------------------------------------- Thu Mar 10 10:09:41 UTC 2022 - pgajdos@suse.com diff --git a/python-argh.spec b/python-argh.spec index 42db61e..3fb83f0 100644 --- a/python-argh.spec +++ b/python-argh.spec @@ -1,7 +1,7 @@ # # spec file for package python-argh # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,16 +18,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-argh -Version: 0.26.2 +Version: 0.28.1 Release: 0 Summary: An argparse wrapper License: LGPL-3.0-or-later URL: https://github.com/neithere/argh/ Source: https://files.pythonhosted.org/packages/source/a/argh/argh-%{version}.tar.gz -Patch0: support-py39.patch -# https://github.com/neithere/argh/issues/152 -Patch1: python-argh-no_mock.patch -BuildRequires: %{python_module iocapture} +BuildRequires: %{python_module flit-core} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -56,22 +54,23 @@ can be mixed. Keep in mind that argh.dispatch does some extra work that a custom dispatcher may not do. %prep -%setup -q -n argh-%{version} -%autopatch -p1 +%autosetup -p1 -n argh-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest +# do not run test_integration, which requires dropped iocapture +rm tests/test_integration.py +%pytest -v %files %{python_files} %doc README.rst %{python_sitelib}/argh/ -%{python_sitelib}/argh-%{version}-py*.egg-info +%{python_sitelib}/argh-%{version}.dist-info %changelog diff --git a/support-py39.patch b/support-py39.patch deleted file mode 100644 index bcc72d2..0000000 --- a/support-py39.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: argh-0.26.2/test/test_integration.py -=================================================================== ---- argh-0.26.2.orig/test/test_integration.py -+++ argh-0.26.2/test/test_integration.py -@@ -377,7 +377,7 @@ def test_invalid_choice(): - p = DebugArghParser() - p.add_commands([cmd]) - -- assert run(p, 'bar', exit=True).startswith('invalid choice') -+ assert 'invalid choice' in run(p, 'bar', exit=True) - - if sys.version_info < (3,3): - # Python before 3.3 exits with a less informative error -@@ -391,7 +391,7 @@ def test_invalid_choice(): - p = DebugArghParser() - p.add_commands([cmd], namespace='nest') - -- assert run(p, 'nest bar', exit=True).startswith('invalid choice') -+ assert 'invalid choice' in run(p, 'nest bar', exit=True) - - if sys.version_info < (3,3): - # Python before 3.3 exits with a less informative error -@@ -511,7 +511,7 @@ def test_explicit_cmd_name(): - - p = DebugArghParser() - p.add_commands([orig_name]) -- assert run(p, 'orig-name', exit=True).startswith('invalid choice') -+ assert 'invalid choice' in run(p, 'orig-name', exit=True) - assert run(p, 'new-name').out == 'ok\n' - -