From 83fd5d91bdd6d8eca569a3a7e54610a5f2bec2a58c8b105362868d7d77ec9f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Jan 2020 12:02:05 +0000 Subject: [PATCH] Accepting request 765194 from home:mcalabkova:branches:devel:languages:python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update to 1.11.1 * Add -o bashdefault to register-python-argcomplete’s output command * Use shell builtins where possible * Switch from pkg_resources to importlib * Remove .sh extension by bash-completion convention * Do not suggest options after – * Include all test directory contents in source distribution * Trigger completers on –optional=PARTIAL_VALUE * Documentation and test improvements OBS-URL: https://build.opensuse.org/request/show/765194 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-argcomplete?expand=0&rev=27 --- argcomplete-1.10.0.tar.gz | 3 --- argcomplete-1.11.1.tar.gz | 3 +++ python-argcomplete.changes | 13 +++++++++++++ python-argcomplete.spec | 10 +++++----- skip_tcsh_tests.patch | 10 +++++----- trim-test-deps.patch | 10 ++++++---- 6 files changed, 32 insertions(+), 17 deletions(-) delete mode 100644 argcomplete-1.10.0.tar.gz create mode 100644 argcomplete-1.11.1.tar.gz diff --git a/argcomplete-1.10.0.tar.gz b/argcomplete-1.10.0.tar.gz deleted file mode 100644 index e2fe4dc..0000000 --- a/argcomplete-1.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45836de8cc63d2f6e06b898cef1e4ce1e9907d246ec77ac8e64f23f153d6bec1 -size 47271 diff --git a/argcomplete-1.11.1.tar.gz b/argcomplete-1.11.1.tar.gz new file mode 100644 index 0000000..5325309 --- /dev/null +++ b/argcomplete-1.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ae7b601be17bf38a749ec06aa07fb04e7b6b5fc17906948dc1866e7facf3740 +size 50773 diff --git a/python-argcomplete.changes b/python-argcomplete.changes index c39dd73..514114c 100644 --- a/python-argcomplete.changes +++ b/python-argcomplete.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jan 17 10:42:58 UTC 2020 - Marketa Calabkova + +- update to 1.11.1 + * Add -o bashdefault to register-python-argcomplete’s output command + * Use shell builtins where possible + * Switch from pkg_resources to importlib + * Remove .sh extension by bash-completion convention + * Do not suggest options after – + * Include all test directory contents in source distribution + * Trigger completers on –optional=PARTIAL_VALUE + * Documentation and test improvements + ------------------------------------------------------------------- Fri Sep 13 12:45:13 UTC 2019 - Tomáš Chvátal diff --git a/python-argcomplete.spec b/python-argcomplete.spec index 28386f0..4409f62 100644 --- a/python-argcomplete.spec +++ b/python-argcomplete.spec @@ -1,7 +1,7 @@ # # spec file for package python-argcomplete # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2013 Darin Perusich. # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-argcomplete -Version: 1.10.0 +Version: 1.11.1 Release: 0 Summary: Bash tab completion for argparse License: Apache-2.0 @@ -28,7 +28,9 @@ 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 +BuildRequires: %{python_module importlib-metadata} BuildRequires: %{python_module pexpect} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: fish @@ -63,13 +65,12 @@ resources over the network). rm -rf %{buildroot}%{python_sitelib}/test rm %{buildroot}%{_bindir}/activate-global-python-argcomplete %python_expand %fdupes %{buildroot}%{$python_sitelib} -install -DTm644 %{buildroot}%{python_sitelib}/argcomplete/bash_completion.d/python-argcomplete.sh %{buildroot}%{_datadir}/bash-completion/completions/python-argcomplete.sh # tcsh support is broken rm %{buildroot}%{_bindir}/python-argcomplete-tcsh %check export LANG=en_US.UTF-8 -%python_exec setup.py test +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m unittest discover -v %files %{python_files} %doc README.rst @@ -78,6 +79,5 @@ export LANG=en_US.UTF-8 %{python_sitelib}/argcomplete %python3_only %{_bindir}/python-argcomplete-check-easy-install-script %python3_only %{_bindir}/register-python-argcomplete -%python3_only %{_datadir}/bash-completion/completions/python-argcomplete.sh %changelog diff --git a/skip_tcsh_tests.patch b/skip_tcsh_tests.patch index a06976f..b94f35b 100644 --- a/skip_tcsh_tests.patch +++ b/skip_tcsh_tests.patch @@ -1,9 +1,9 @@ -Index: argcomplete-1.10.0/test/test.py +Index: argcomplete-1.11.0/test/test.py =================================================================== ---- argcomplete-1.10.0.orig/test/test.py -+++ argcomplete-1.10.0/test/test.py -@@ -1179,34 +1179,6 @@ class TestBashGlobal(TestBash): - self.assertEqual(self.sh.run_command('python -m package.prog basic f\t'), 'foo\r\n') +--- argcomplete-1.11.0.orig/test/test.py ++++ argcomplete-1.11.0/test/test.py +@@ -1219,34 +1219,6 @@ class TestBashGlobal(TestBash): + self._test_console_script(package=True, wheel=True) -class TestTcsh(_TestSh, unittest.TestCase): diff --git a/trim-test-deps.patch b/trim-test-deps.patch index 3aafbe0..3766404 100644 --- a/trim-test-deps.patch +++ b/trim-test-deps.patch @@ -1,11 +1,13 @@ ---- argcomplete-1.9.2.orig/setup.py 2017-08-24 00:37:12.000000000 +0700 -+++ argcomplete-1.9.2/setup.py 2019-02-10 21:22:50.518878293 +0700 -@@ -4,7 +4,7 @@ +Index: argcomplete-1.11.0/setup.py +=================================================================== +--- argcomplete-1.11.0.orig/setup.py ++++ argcomplete-1.11.0/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"] setup( - name='argcomplete',