Sync from SUSE:SLFO:1.1 python-argcomplete revision 3ad37ea307d95c927f6df19b6a4c2b05

_multibuild

@@ -1,3 +0,0 @@
-<multibuild>
-  <package>test</package>
-</multibuild>

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
+ 

python-argcomplete.changes

@@ -1,59 +1,3 @@
--------------------------------------------------------------------
-Tue Dec 10 11:12:48 UTC 2024 - Markéta Machová <mmachova@suse.com>
-
-- Update to version 3.5.2
-  * Fix _parse_known_args monkeypatching. This fix is required to restore 
-    compatibility with Python 3.12.8 and 3.13.1.
-
--------------------------------------------------------------------
-Tue Oct 29 17:07:05 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
-
-- Update to the version 3.5.1:
-  - Restore compatibility with argparse in Python 3.12.7+
-  - Use project.scripts instead of setuptools scripts
-  - Test infrastructure improvements
-- Remove upstreamed patches:
-  - argparse-3_12_7.patch
-- Add _multibuild (to make testing against fully installed package)
-
--------------------------------------------------------------------
-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>
 

python-argcomplete.spec

@@ -18,36 +18,26 @@
 
 
 %{?sle15_python_module_pythons}
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "test"
-%define psuffix -test
-%bcond_without test
-%else
-%define psuffix %{nil}
-%bcond_with test
-%endif
-Name:           python-argcomplete%{psuffix}
-Version:        3.5.2
+Name:           python-argcomplete
+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
+# 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 >= 67.2}
 BuildRequires:  %{python_module setuptools_scm >= 6.2}
 BuildRequires:  %{python_module wheel}
+BuildRequires:  ca-certificates
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-%if %{with test}
-BuildRequires:  %{python_module argcomplete == %{version}}
-BuildRequires:  %{python_module pexpect}
-BuildRequires:  ca-certificates-mozilla
-BuildRequires:  fish
 BuildRequires:  zsh
-%endif
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 BuildArch:      noarch
@@ -71,40 +61,31 @@ resources over the network).
 %autosetup -p1 -n argcomplete-%{version}
 
 %build
-%if %{without test}
 %pyproject_wheel
-%endif
 
 %install
-%if %{without test}
 %pyproject_install
-%python_clone -a %{buildroot}%{_bindir}/activate-global-python-argcomplete
 %python_clone -a %{buildroot}%{_bindir}/register-python-argcomplete
 %python_clone -a %{buildroot}%{_bindir}/python-argcomplete-check-easy-install-script
+rm %{buildroot}%{_bindir}/activate-global-python-argcomplete
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
-%endif
 
 %check
-%if %{with test}
 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/299
-  sed -i -e "1s|#!.*python.*|#!%{__$python}|" test/prog test/*.py
+  sed -i -e "1s|#!.*python.*|#!%{__$python}|" test/prog test/*.py scripts/*
   sed -i -e "s|python3 |$python |g" test/test.py
-  $python ./test/test.py -v
+  PYTHONPATH=%{buildroot}%{$python_sitelib} $python ./test/test.py -v
 }
-%endif
 
-%if %{without test}
 %post
-%python_install_alternative activate-global-python-argcomplete
 %python_install_alternative register-python-argcomplete
 %python_install_alternative python-argcomplete-check-easy-install-script
 
 %postun
-%python_uninstall_alternative activate-global-python-argcomplete
 %python_uninstall_alternative register-python-argcomplete
 %python_uninstall_alternative python-argcomplete-check-easy-install-script
 
@@ -113,9 +94,7 @@ export TERM=xterm-mono
 %license LICENSE.rst
 %{python_sitelib}/argcomplete-%{version}.dist-info
 %{python_sitelib}/argcomplete
-%python_alternative %{_bindir}/activate-global-python-argcomplete
 %python_alternative %{_bindir}/python-argcomplete-check-easy-install-script
 %python_alternative %{_bindir}/register-python-argcomplete
-%endif
 
 %changelog