From fd1b9a6c26696537f9fe450c994a24100477e956d24fde8ee2b93b1b5551d22d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 20 Dec 2020 09:21:17 +0000 Subject: [PATCH] - update to 1.12.2: - Update importlib-metadata dependency pin (#332) - Add change log project URL (#312) - Replace Travis CI with GitHub Actions (#323) - Update importlib-metadata dependency version range - Bash nounset mode fixes (#313) - remove 0001-Remove-expected-test-failure-for-new-versions-of-fish.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-argcomplete?expand=0&rev=35 --- ...est-failure-for-new-versions-of-fish.patch | 35 ------------------- argcomplete-1.11.1.tar.gz | 3 -- argcomplete-1.12.2.tar.gz | 3 ++ python-argcomplete.changes | 11 ++++++ python-argcomplete.spec | 3 +- skip_tcsh_tests.patch | 16 ++++++--- trim-test-deps.patch | 8 ++--- 7 files changed, 30 insertions(+), 49 deletions(-) delete mode 100644 0001-Remove-expected-test-failure-for-new-versions-of-fish.patch delete mode 100644 argcomplete-1.11.1.tar.gz create mode 100644 argcomplete-1.12.2.tar.gz diff --git a/0001-Remove-expected-test-failure-for-new-versions-of-fish.patch b/0001-Remove-expected-test-failure-for-new-versions-of-fish.patch deleted file mode 100644 index fcc227f..0000000 --- a/0001-Remove-expected-test-failure-for-new-versions-of-fish.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 08bfc8a788e8081515d733e67be026d051c726f7 Mon Sep 17 00:00:00 2001 -From: Evan -Date: Thu, 19 Mar 2020 14:55:07 +1100 -Subject: [PATCH] Remove expected test failure for new versions of fish (#292) - ---- - test/test.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/test/test.py b/test/test.py -index e91352b..2c34806 100755 ---- a/test/test.py -+++ b/test/test.py -@@ -28,6 +28,8 @@ - - BASH_VERSION = subprocess.check_output(['bash', '-c', 'echo $BASH_VERSION']).decode() - BASH_MAJOR_VERSION = int(BASH_VERSION.split('.')[0]) -+FISH_VERSION_STR = subprocess.check_output(['fish', '-c', 'echo -n $FISH_VERSION']).decode() -+FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('.')) - - - class TempDir(object): -@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase): - expected_failures = [ - 'test_parse_special_characters', - 'test_comp_point', -- 'test_special_characters_double_quoted' - ] -+ if FISH_VERSION_TUPLE < (3, 1): -+ expected_failures.extend([ -+ 'test_special_characters_double_quoted' -+ ]) - - skipped = [ - 'test_single_quotes_in_single_quotes', diff --git a/argcomplete-1.11.1.tar.gz b/argcomplete-1.11.1.tar.gz deleted file mode 100644 index 5325309..0000000 --- a/argcomplete-1.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ae7b601be17bf38a749ec06aa07fb04e7b6b5fc17906948dc1866e7facf3740 -size 50773 diff --git a/argcomplete-1.12.2.tar.gz b/argcomplete-1.12.2.tar.gz new file mode 100644 index 0000000..88d5fe7 --- /dev/null +++ b/argcomplete-1.12.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04 +size 53861 diff --git a/python-argcomplete.changes b/python-argcomplete.changes index 76e9399..0ed403c 100644 --- a/python-argcomplete.changes +++ b/python-argcomplete.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Dec 20 09:17:00 UTC 2020 - Dirk Müller + +- update to 1.12.2: + - Update importlib-metadata dependency pin (#332) + - Add change log project URL (#312) + - Replace Travis CI with GitHub Actions (#323) + - Update importlib-metadata dependency version range + - Bash nounset mode fixes (#313) +- remove 0001-Remove-expected-test-failure-for-new-versions-of-fish.patch (upstream) + ------------------------------------------------------------------- Wed May 27 13:01:18 UTC 2020 - Petr Gajdos diff --git a/python-argcomplete.spec b/python-argcomplete.spec index 53a8825..170c446 100644 --- a/python-argcomplete.spec +++ b/python-argcomplete.spec @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-argcomplete -Version: 1.11.1 +Version: 1.12.2 Release: 0 Summary: Bash tab completion for argparse License: Apache-2.0 @@ -28,7 +28,6 @@ URL: https://github.com/kislyuk/argcomplete Source: https://files.pythonhosted.org/packages/source/a/argcomplete/argcomplete-%{version}.tar.gz Patch0: skip_tcsh_tests.patch Patch1: trim-test-deps.patch -Patch2: 0001-Remove-expected-test-failure-for-new-versions-of-fish.patch BuildRequires: %{python_module importlib-metadata >= 0.23} BuildRequires: %{python_module pexpect} BuildRequires: %{python_module pip} diff --git a/skip_tcsh_tests.patch b/skip_tcsh_tests.patch index b94f35b..fc6ce84 100644 --- a/skip_tcsh_tests.patch +++ b/skip_tcsh_tests.patch @@ -1,8 +1,8 @@ -Index: argcomplete-1.11.0/test/test.py +Index: argcomplete-1.12.2/test/test.py =================================================================== ---- argcomplete-1.11.0.orig/test/test.py -+++ argcomplete-1.11.0/test/test.py -@@ -1219,34 +1219,6 @@ class TestBashGlobal(TestBash): +--- argcomplete-1.12.2.orig/test/test.py ++++ argcomplete-1.12.2/test/test.py +@@ -1310,40 +1310,6 @@ class TestBashGlobal(TestBash): self._test_console_script(package=True, wheel=True) @@ -22,7 +22,13 @@ Index: argcomplete-1.11.0/test/test.py - path = ' '.join([os.path.join(BASE_DIR, 'scripts'), TEST_DIR, '$path']) - sh.run_command('set path = ({0})'.format(path)) - sh.run_command('setenv PYTHONPATH {0}'.format(BASE_DIR)) -- output = sh.run_command('eval `register-python-argcomplete --shell tcsh prog`') +- # 'dummy' argument unused; checks multi-command registration works +- # by passing 'prog' as the second argument. +- output = sh.run_command('eval `register-python-argcomplete --shell tcsh dummy prog`') +- self.assertEqual(output, '') +- # Register a dummy completion with an external argcomplete script +- # to ensure this doesn't overwrite our previous registration. +- output = sh.run_command('eval `register-python-argcomplete --shell tcsh dummy --external-argcomplete-script dummy`') - self.assertEqual(output, '') - self.sh = sh - diff --git a/trim-test-deps.patch b/trim-test-deps.patch index 3766404..bbf9761 100644 --- a/trim-test-deps.patch +++ b/trim-test-deps.patch @@ -1,13 +1,13 @@ -Index: argcomplete-1.11.0/setup.py +Index: argcomplete-1.12.2/setup.py =================================================================== ---- argcomplete-1.11.0.orig/setup.py -+++ argcomplete-1.11.0/setup.py +--- argcomplete-1.12.2.orig/setup.py ++++ argcomplete-1.12.2/setup.py @@ -4,7 +4,7 @@ import glob from setuptools import setup, find_packages install_requires = [] -tests_require = ["coverage", "flake8", "pexpect", "wheel"] +tests_require = ["pexpect"] - importlib_backport_requires = ["importlib-metadata >= 0.23, < 2"] + importlib_backport_requires = ["importlib-metadata >= 0.23, < 4"] setup(