From e24b77befec289521f452e34a45e095184c3ef4074e518fdd4576ff29c1dce41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 25 Sep 2024 17:13:18 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-argcomplete revision 3ad37ea307d95c927f6df19b6a4c2b05 --- argcomplete-3.0.8.tar.gz | 3 -- argcomplete-3.3.0.tar.gz | 3 ++ bash-repl.patch | 13 ++++++ python-argcomplete.changes | 96 +++++++++++++++++++++++++++++++++++--- python-argcomplete.spec | 31 ++++++------ trim-test-deps.patch | 13 ------ without_zsh.patch | 27 ----------- 7 files changed, 121 insertions(+), 65 deletions(-) delete mode 100644 argcomplete-3.0.8.tar.gz create mode 100644 argcomplete-3.3.0.tar.gz create mode 100644 bash-repl.patch delete mode 100644 trim-test-deps.patch delete mode 100644 without_zsh.patch diff --git a/argcomplete-3.0.8.tar.gz b/argcomplete-3.0.8.tar.gz deleted file mode 100644 index 1918894..0000000 --- a/argcomplete-3.0.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9ca96448e14fa459d7450a4ab5a22bbf9cee4ba7adddf03e65c398b5daeea28 -size 56035 diff --git a/argcomplete-3.3.0.tar.gz b/argcomplete-3.3.0.tar.gz new file mode 100644 index 0000000..25a9dfa --- /dev/null +++ b/argcomplete-3.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd03ff4a5b9e6580569d34b273f741e85cd9e072f3feeeee3eba4891c70eda62 +size 81832 diff --git a/bash-repl.patch b/bash-repl.patch new file mode 100644 index 0000000..6cdbc2e --- /dev/null +++ b/bash-repl.patch @@ -0,0 +1,13 @@ +Index: argcomplete-3.0.8/test/test.py +=================================================================== +--- argcomplete-3.0.8.orig/test/test.py ++++ argcomplete-3.0.8/test/test.py +@@ -65,7 +65,7 @@ def _repl_sh(command, args, non_printabl + + + def bash_repl(command="bash"): +- bashrc = os.path.join(os.path.dirname(pexpect.__file__), "replwrap", "bashrc.sh") ++ bashrc = os.path.join(os.path.dirname(pexpect.__file__), "bashrc.sh") + sh = _repl_sh(command, ["--rcfile", bashrc], non_printable_insert="\\[\\]") + return sh + diff --git a/python-argcomplete.changes b/python-argcomplete.changes index f4f7e07..fb9dc29 100644 --- a/python-argcomplete.changes +++ b/python-argcomplete.changes @@ -1,3 +1,87 @@ +------------------------------------------------------------------- +Thu Apr 18 06:26:52 UTC 2024 - Daniel Garcia + +- Update to 3.3.0 (bsc#1222880): + * Preserve compatibility with argparse option tuples of length 4. + This update is required to use argcomplete on Python 3.11.9+ or + 3.12.3+. +- update to 3.2.3: + * Allow register-python-argcomplete output to be used as lazy-loaded + zsh completion module (#475) + - Move debug_stream initialization to helper method to allow fd 9 + behavior to be overridden in subclasses (#471) + +------------------------------------------------------------------- +Tue Jan 30 12:07:05 UTC 2024 - Dirk Müller + +- update to 3.2.2: + * Expand tilde in zsh + +------------------------------------------------------------------- +Wed Jan 3 10:54:17 UTC 2024 - Ben Greiner + +- Remove coverage check +- Fix zsh test failures: avoid coloring terminal + +------------------------------------------------------------------- +Fri Dec 29 18:27:06 UTC 2023 - Dirk Müller + +- update to 3.2.1: + * Allow explicit zsh global completion activation (#467) + * Fix and test global completion in zsh (#463, #466) + * Add –yes option to activate-global-python-argcomplete (#461) + * Test suite improvements +- drop without_zsh.patch: obsolete + +------------------------------------------------------------------- +Mon Nov 27 15:26:30 UTC 2023 - Dirk Müller + +- update to 3.1.6: + * Respect user choice in activate-global-python-argcomplete + * Escape colon in zsh completions. Fixes #456 + * Call \_default as a fallback in zsh global completion + +------------------------------------------------------------------- +Fri Nov 10 12:26:40 UTC 2023 - Dirk Müller + +- update to 3.1.4: + * Call \_default as a fallback in zsh global completion + * zsh: Allow to use external script (#453) + * Add support for Python 3.12 and drop EOL 3.6 and 3.7 (#449) + * Use homebrew prefix by default + * zsh: Allow to use external script (#453) + +------------------------------------------------------------------- +Tue Oct 24 12:01:08 UTC 2023 - Dirk Müller + +- add setuptools_scm for proper version detection + +------------------------------------------------------------------- +Thu Oct 5 08:46:50 UTC 2023 - Dirk Müller + +- update to 3.1.2: + *Ensure Python 3.12+ compatibility in check_console_script + +------------------------------------------------------------------- +Tue Jul 4 11:24:40 UTC 2023 - John Paul Adrian Glaubitz + +- Update to version 3.1.1 + * Search through asdf shims + * Use \` as escape character in PowerShell (#434) +- from version 3.1.0 + * setup.py -> pyproject.toml migration start (#427) + * Improve user install logic in activate-global-python-argcomplete (#437) + * Ensure Python 3.7 compatibility in check_console_script (#436) + * ZSH implementation fixes (#431, #433) + * Documentation improvements +- Drop obsolete patch + * trim-test-deps.patch + +------------------------------------------------------------------- +Tue May 30 16:02:49 UTC 2023 - Andreas Schwab + +- bash-repl.patch: Use correct place for auxiliary bashrc.sh file from pexpect + ------------------------------------------------------------------- Fri May 5 11:23:29 UTC 2023 - Daniel Garcia @@ -68,7 +152,7 @@ Thu Mar 16 09:32:50 UTC 2023 - Matej Cepl ------------------------------------------------------------------- Tue Jan 31 23:49:21 UTC 2023 - Dirk Müller -- fix substitution on tests/test.py to test the current python flavor +- fix substitution on tests/test.py to test the current python flavor ------------------------------------------------------------------- Wed Jul 6 10:04:40 UTC 2022 - Dirk Müller @@ -197,7 +281,7 @@ Tue Nov 02 20:50:53 UTC 2016 - achim.herwig@wodca.de Sat Dec 12 17:49:43 UTC 2015 - mimi.vx@gmail.com - update to 1.0.0 -* Don't print args with suppressed help by default; add +* Don't print args with suppressed help by default; add argcomplete.autocomplete(print_suppressed=True) to control this behavior * Fix always_complete_options=False support. * Correct doc filename in setup.cfg @@ -285,15 +369,15 @@ Thu May 2 14:04:51 UTC 2013 - speilicke@suse.com ------------------------------------------------------------------- Mon Apr 29 11:10:08 UTC 2013 - darin@darins.net -- fixed license, set noarch for build +- fixed license, set noarch for build ------------------------------------------------------------------- Fri Apr 26 20:49:09 UTC 2013 - darin@darins.net -- add files in _bindir -- add python-distribute +- add files in _bindir +- add python-distribute ------------------------------------------------------------------- Fri Apr 26 20:44:08 UTC 2013 - darin@darins.net -- Initial packaging +- Initial packaging diff --git a/python-argcomplete.spec b/python-argcomplete.spec index 035cd12..0d198fd 100644 --- a/python-argcomplete.spec +++ b/python-argcomplete.spec @@ -1,7 +1,7 @@ # # spec file for package python-argcomplete # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2013 Darin Perusich. # # All modifications and additions to the file contributed by third parties @@ -17,29 +17,29 @@ # -%global skip_python2 1 %{?sle15_python_module_pythons} Name: python-argcomplete -Version: 3.0.8 +Version: 3.3.0 Release: 0 Summary: Bash tab completion for argparse License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/kislyuk/argcomplete Source: https://files.pythonhosted.org/packages/source/a/argcomplete/argcomplete-%{version}.tar.gz -Patch1: trim-test-deps.patch -# Don't fail the test suite when zsh is not available -Patch2: without_zsh.patch -BuildRequires: %{python_module coverage} +# Use correct place for auxiliary bashrc.sh file from pexpect +Patch3: bash-repl.patch +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module pexpect} BuildRequires: %{python_module pip} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module setuptools >= 67.2} +BuildRequires: %{python_module setuptools_scm >= 6.2} BuildRequires: %{python_module wheel} BuildRequires: ca-certificates BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: zsh Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives BuildArch: noarch %python_subpackages @@ -61,25 +61,24 @@ resources over the network). %autosetup -p1 -n argcomplete-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/register-python-argcomplete %python_clone -a %{buildroot}%{_bindir}/python-argcomplete-check-easy-install-script -rm -rf %{buildroot}%{python_sitelib}/test rm %{buildroot}%{_bindir}/activate-global-python-argcomplete %python_expand %fdupes %{buildroot}%{$python_sitelib} %check export LANG=en_US.UTF-8 +export TERM=xterm-mono %{python_expand \ # https://github.com/kislyuk/argcomplete/issues/255 - # https://github.com/kislyuk/argcomplete/issues/256 # https://github.com/kislyuk/argcomplete/issues/299 - sed -i -e "1s|#!.*python.*|#!%{_bindir}/$python|" test/prog scripts/* + sed -i -e "1s|#!.*python.*|#!%{__$python}|" test/prog test/*.py scripts/* sed -i -e "s|python3 |$python |g" test/test.py - PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m coverage run --source=argcomplete --omit=argcomplete/packages/_shlex.py ./test/test.py -v + PYTHONPATH=%{buildroot}%{$python_sitelib} $python ./test/test.py -v } %post @@ -93,7 +92,7 @@ export LANG=en_US.UTF-8 %files %{python_files} %doc README.rst %license LICENSE.rst -%{python_sitelib}/argcomplete-%{version}*-info +%{python_sitelib}/argcomplete-%{version}.dist-info %{python_sitelib}/argcomplete %python_alternative %{_bindir}/python-argcomplete-check-easy-install-script %python_alternative %{_bindir}/register-python-argcomplete diff --git a/trim-test-deps.patch b/trim-test-deps.patch deleted file mode 100644 index ff01026..0000000 --- a/trim-test-deps.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: argcomplete-3.0.8/setup.py -=================================================================== ---- argcomplete-3.0.8.orig/setup.py -+++ argcomplete-3.0.8/setup.py -@@ -5,7 +5,7 @@ import glob - from setuptools import find_packages, setup - - install_requires = [] --tests_require = ["coverage", "pexpect", "wheel", "ruff", "mypy"] -+tests_require = ["pexpect"] - importlib_backport_requires = ["importlib-metadata >= 0.23, < 7"] - - setup( diff --git a/without_zsh.patch b/without_zsh.patch deleted file mode 100644 index bab1836..0000000 --- a/without_zsh.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: argcomplete-3.0.8/test/test.py -=================================================================== ---- argcomplete-3.0.8.orig/test/test.py -+++ argcomplete-3.0.8/test/test.py -@@ -1299,22 +1299,6 @@ class TestBash(TestBashZshBase, unittest - self.test_simple_completion() - - --class TestZsh(TestBashZshBase, unittest.TestCase): -- expected_failures = [ -- "test_parse_special_characters_dollar", -- "test_comp_point", # FIXME -- "test_completion_environment", # FIXME -- "test_continuation", # FIXME -- "test_wordbreak_chars", # FIXME -- ] -- -- def test_parse_special_characters(self): -- pass # FIXME: test crashes in teardown -- -- def repl_provider(self): -- return zsh_repl() -- -- - @unittest.skipIf(BASH_MAJOR_VERSION < 4, "complete -D not supported") - class TestBashGlobal(TestBash): - install_cmd = 'eval "$(activate-global-python-argcomplete --dest=-)"'