Sync from SUSE:SLFO:Main python-argcomplete revision 2f9f7c2470030f45c3fad1e742a5c974

This commit is contained in:
Adrian Schröter 2024-12-13 11:09:38 +01:00
parent e24b77befe
commit 6841d888a4
6 changed files with 68 additions and 20 deletions

BIN
argcomplete-3.3.0.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
argcomplete-3.4.0.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

22
argparse-3_12_7.patch Normal file
View File

@ -0,0 +1,22 @@
From 480d112ba488fa6825db877201577270053dacce Mon Sep 17 00:00:00 2001
From: Eggry Ran <eggry@live.cn>
Date: Sun, 6 Oct 2024 16:16:49 +0800
Subject: [PATCH] Fix issue #507
---
argcomplete/packages/_argparse.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/argcomplete/packages/_argparse.py b/argcomplete/packages/_argparse.py
index 2a064f9..d10cf01 100644
--- a/argcomplete/packages/_argparse.py
+++ b/argcomplete/packages/_argparse.py
@@ -162,6 +162,8 @@ def take_action(action, argument_strings, option_string=None):
def consume_optional(start_index):
# get the optional identified at this index
option_tuple = option_string_indices[start_index]
+ if isinstance(option_tuple, list): # Python 3.12.7+
+ option_tuple = option_tuple[0]
if len(option_tuple) == 3:
action, option_string, explicit_arg = option_tuple
else: # Python 3.11.9+, 3.12.3+, 3.13+

View File

@ -1,13 +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
@@ -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

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Sun Oct 6 21:27:22 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Add argparse-3_12_7.patch which should actually fix
gh#kislyuk/argcomplete#507.
- Remove skip-failing-tests-3_12_7.patch, which is now
unnecessary.
-------------------------------------------------------------------
Sat Oct 5 14:53:29 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Add skip-failing-tests-3_12_7.patch as a temporary workaround,
skip failing tests (gh#kislyuk/argcomplete#507).
-------------------------------------------------------------------
Tue Aug 13 20:18:47 UTC 2024 - Dirk Müller <dmueller@suse.com>
- require ca-certificates-mozilla for the pip >= 24.2
-------------------------------------------------------------------
Mon Jul 15 11:25:31 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to 3.4.0
* No stdin for python calls from bash completion functions (#488)
- Prevents usage of stdin by (python) executables that are called
during completion generation. This prevents the completion locking up
the entire shell when the python script is broken i.e. it enters an
interactive mode (REPL) instead of generating the completions, as
expected.
* Localize shell variable REPLY to avoid overwriting users value (#489)
- The variable REPLY is used by default by the ``read`` shell builtin
to store the return value, and like all bash/zsh variables, is scoped
globally. This change allows this variable to be used for other needs
by appropriately scoping its internal use by an argcomplete utility
function that uses ``read``.
- Drop patches for issued fixed upstream
* bash-repl.patch
-------------------------------------------------------------------
Thu Apr 18 06:26:52 UTC 2024 - Daniel Garcia <daniel.garcia@suse.com>

View File

@ -19,22 +19,23 @@
%{?sle15_python_module_pythons}
Name: python-argcomplete
Version: 3.3.0
Version: 3.4.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
# Use correct place for auxiliary bashrc.sh file from pexpect
Patch3: bash-repl.patch
# PATCH-FIX-OPENSUSE argparse-3_12_7.patch gh#kislyuk/argcomplete#507 mcepl@suse.com
# fix the incompatibility with Python 3.12.7+
Patch0: argparse-3_12_7.patch
BuildRequires: %{python_module base >= 3.8}
BuildRequires: %{python_module pexpect}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools >= 67.2}
BuildRequires: %{python_module setuptools_scm >= 6.2}
BuildRequires: %{python_module wheel}
BuildRequires: ca-certificates
BuildRequires: ca-certificates-mozilla
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: zsh