argcomplete 3.1.2__tar.gz → 3.1.4__tar.gz

{argcomplete-3.1.2 → argcomplete-3.1.4}/.github/workflows/ci.yml

@@ -9,13 +9,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
         python-version: ${{matrix.python-version}}
+        allow-prereleases: true
     - name: Install CI dependencies
       run: |
         [[ $(uname) == Linux ]] && sudo apt-get install --yes rpm tcsh fish zsh

{argcomplete-3.1.2 → argcomplete-3.1.4}/Changes.rst

@@ -1,3 +1,26 @@
+Changes for v3.1.4 (2023-11-01)
+===============================
+
+-  Call \_default as a fallback in zsh global completion
+
+Changes for v3.1.3 (2023-11-01)
+===============================
+
+-  Use homebrew prefix by default
+
+-  zsh: Allow to use external script (#453)
+
+-  Add support for Python 3.12 and drop EOL 3.6 and 3.7 (#449)
+
+Changes for v3.1.3 (2023-11-01)
+===============================
+
+-  Use homebrew prefix by default
+
+-  zsh: Allow to use external script (#453)
+
+-  Add support for Python 3.12 and drop EOL 3.6 and 3.7 (#449)
+
 Changes for v3.1.2 (2023-09-16)
 ===============================
 

{argcomplete-3.1.2/argcomplete.egg-info → argcomplete-3.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: argcomplete
-Version: 3.1.2
+Version: 3.1.4
 Summary: Bash tab completion for argparse
 Home-page: https://github.com/kislyuk/argcomplete
 Author: Andrey Kislyuk
@@ -24,6 +24,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Development Status :: 5 - Production/Stable
@@ -31,11 +32,10 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Shells
 Classifier: Topic :: Terminals
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
 License-File: NOTICE
-Requires-Dist: importlib-metadata<7,>=0.23; python_version < "3.8"
 Provides-Extra: test
 Requires-Dist: coverage; extra == "test"
 Requires-Dist: pexpect; extra == "test"
@@ -264,7 +264,7 @@ multiple Python versions on the same system, the version being used to run the s
 
  When using bash, global completion requires bash support for ``complete -D``, which was introduced in bash 4.2. Since
  Mac OS ships with an outdated version of Bash (3.2), you can either use zsh or install a newer version of bash using
- `Homebrew <http://brew.sh/>`_ (``brew install bash`` - you will also need to add ``/usr/local/bin/bash`` to
+ `Homebrew <http://brew.sh/>`_ (``brew install bash`` - you will also need to add ``/opt/homebrew/bin/bash`` to
  ``/etc/shells``, and run ``chsh`` to change your shell). You can check the version of the running copy of bash with
  ``echo $BASH_VERSION``.
 

{argcomplete-3.1.2 → argcomplete-3.1.4}/README.rst

@@ -219,7 +219,7 @@ multiple Python versions on the same system, the version being used to run the s
 
  When using bash, global completion requires bash support for ``complete -D``, which was introduced in bash 4.2. Since
  Mac OS ships with an outdated version of Bash (3.2), you can either use zsh or install a newer version of bash using
- `Homebrew <http://brew.sh/>`_ (``brew install bash`` - you will also need to add ``/usr/local/bin/bash`` to
+ `Homebrew <http://brew.sh/>`_ (``brew install bash`` - you will also need to add ``/opt/homebrew/bin/bash`` to
  ``/etc/shells``, and run ``chsh`` to change your shell). You can check the version of the running copy of bash with
  ``echo $BASH_VERSION``.
 

{argcomplete-3.1.2 → argcomplete-3.1.4}/argcomplete/_check_console_script.py

@@ -14,14 +14,8 @@ Intended to be invoked by argcomplete's global completion function.
 import os
 import sys
 
-try:
-    from importlib.metadata import entry_points as importlib_entry_points
-    from importlib.metadata import EntryPoint
-    use_entry_points_backport = False
-except ImportError:
-    from importlib_metadata import entry_points as importlib_entry_points  # type:ignore
-    from importlib_metadata import EntryPoint # type:ignore
-    use_entry_points_backport = True
+from importlib.metadata import entry_points as importlib_entry_points
+from importlib.metadata import EntryPoint
 
 from ._check_module import ArgcompleteMarkerNotFound, find
 from typing import Iterable
@@ -37,10 +31,9 @@ def main():
 
     entry_points : Iterable[EntryPoint] = importlib_entry_points() # type:ignore
 
-    # The importlib_metadata backport returns a tuple of entry point objects
-    # whereas the official library returns a SelectableGroups object
-    # Python 3.12+ behaves like the importlib_metadata backport
-    if not use_entry_points_backport and sys.version_info < (3, 12):
+    # Python 3.12+ returns a tuple of entry point objects
+    # whereas <=3.11 returns a SelectableGroups object
+    if sys.version_info < (3, 12):
         entry_points = entry_points["console_scripts"] # type:ignore
 
     entry_points = [ep for ep in entry_points \

{argcomplete-3.1.2 → argcomplete-3.1.4}/argcomplete/_check_module.py

@@ -15,7 +15,7 @@ try:
 except ImportError:
     import typing as t
     from collections import namedtuple
-    from imp import find_module
+    from imp import find_module  # type:ignore
 
     ModuleSpec = namedtuple("ModuleSpec", ["origin", "has_location", "submodule_search_locations"])
 

{argcomplete-3.1.2 → argcomplete-3.1.4}/argcomplete/bash_completion.d/_python-argcomplete

@@ -138,8 +138,10 @@ _python_argcomplete_global() {
         req_argv=( "" "${COMP_WORDS[@]:1}" )
         __python_argcomplete_expand_tilde_by_ref executable
     else
-        # TODO: check if we should call _default or use a different condition here
         if [[ "$service" != "-default-" ]]; then
+            # TODO: this may not be sufficient - see https://zsh.sourceforge.io/Doc/Release/Completion-System.html
+            # May need to call _complete with avoid-completer=_python-argcomplete or something like that
+            _default
             return
         fi
         executable="${words[1]}"

{argcomplete-3.1.2 → argcomplete-3.1.4}/argcomplete/shell_integration.py

@@ -32,6 +32,7 @@ __python_argcomplete_run_inner() {
 
 _python_argcomplete%(function_suffix)s() {
     local IFS=$'\013'
+    local script="%(argcomplete_script)s"
     if [[ -n "${ZSH_VERSION-}" ]]; then
         local completions
         completions=($(IFS="$IFS" \
@@ -40,7 +41,7 @@ _python_argcomplete%(function_suffix)s() {
             _ARGCOMPLETE=1 \
             _ARGCOMPLETE_SHELL="zsh" \
             _ARGCOMPLETE_SUPPRESS_SPACE=1 \
-            __python_argcomplete_run "${words[1]}") )
+            __python_argcomplete_run ${script:-${words[1]}}))
         _describe "${words[1]}" completions -o nosort
     else
         local SUPPRESS_SPACE=0
@@ -55,7 +56,7 @@ _python_argcomplete%(function_suffix)s() {
             _ARGCOMPLETE=1 \
             _ARGCOMPLETE_SHELL="bash" \
             _ARGCOMPLETE_SUPPRESS_SPACE=$SUPPRESS_SPACE \
-            __python_argcomplete_run "%(argcomplete_script)s"))
+            __python_argcomplete_run ${script:-$1}))
         if [[ $? != 0 ]]; then
             unset COMPREPLY
         elif [[ $SUPPRESS_SPACE == 1 ]] && [[ "${COMPREPLY-}" =~ [=/:]$ ]]; then
@@ -144,7 +145,7 @@ def shellcode(executables, use_defaults=True, shell="bash", complete_arguments=N
         if script:
             function_suffix = "_" + script
         else:
-            script = "$1"
+            script = ""
             function_suffix = ""
         code = bashcode % dict(
             complete_opts=complete_options,

{argcomplete-3.1.2 → argcomplete-3.1.4/argcomplete.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: argcomplete
-Version: 3.1.2
+Version: 3.1.4
 Summary: Bash tab completion for argparse
 Home-page: https://github.com/kislyuk/argcomplete
 Author: Andrey Kislyuk
@@ -24,6 +24,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Development Status :: 5 - Production/Stable
@@ -31,11 +32,10 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Shells
 Classifier: Topic :: Terminals
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
 License-File: NOTICE
-Requires-Dist: importlib-metadata<7,>=0.23; python_version < "3.8"
 Provides-Extra: test
 Requires-Dist: coverage; extra == "test"
 Requires-Dist: pexpect; extra == "test"
@@ -264,7 +264,7 @@ multiple Python versions on the same system, the version being used to run the s
 
  When using bash, global completion requires bash support for ``complete -D``, which was introduced in bash 4.2. Since
  Mac OS ships with an outdated version of Bash (3.2), you can either use zsh or install a newer version of bash using
- `Homebrew <http://brew.sh/>`_ (``brew install bash`` - you will also need to add ``/usr/local/bin/bash`` to
+ `Homebrew <http://brew.sh/>`_ (``brew install bash`` - you will also need to add ``/opt/homebrew/bin/bash`` to
  ``/etc/shells``, and run ``chsh`` to change your shell). You can check the version of the running copy of bash with
  ``echo $BASH_VERSION``.
 

{argcomplete-3.1.2 → argcomplete-3.1.4}/argcomplete.egg-info/SOURCES.txt

@@ -44,11 +44,9 @@ scripts/activate-global-python-argcomplete
 scripts/python-argcomplete-check-easy-install-script
 scripts/register-python-argcomplete
 test/__init__.py
-test/__init__.pyc
 test/inputrc
 test/prog
 test/test.py
-test/test.pyc
 test/test_contrib_shells.py
 test/test_package/__init__.py
 test/test_package/setup.py

argcomplete-3.1.4/argcomplete.egg-info/requires.txt

@@ -0,0 +1,7 @@
+
+[test]
+coverage
+pexpect
+wheel
+ruff
+mypy

{argcomplete-3.1.2 → argcomplete-3.1.4}/common.mk

@@ -28,7 +28,7 @@ release:
 	    if [[ -f Changes.md ]]; then cat $$TAG_MSG <(echo) Changes.md | sponge Changes.md; git add Changes.md; fi; \
 	    if [[ -f Changes.rst ]]; then cat <(pandoc --from markdown --to rst $$TAG_MSG) <(echo) Changes.rst | sponge Changes.rst; git add Changes.rst; fi; \
 	    git commit -m ${TAG}; \
-	    git tag --sign --annotate --file $$TAG_MSG ${TAG}
+	    git tag --annotate --file $$TAG_MSG ${TAG}
 	git push --follow-tags
 	$(MAKE) install
 	gh release create ${TAG} dist/*.whl --notes="$$(git tag --list ${TAG} -n99 | perl -pe 's/^\S+\s*// if $$. == 1' | sed 's/^\s\s\s\s//')"
@@ -37,7 +37,7 @@ release:
 
 release-pypi:
 	python -m build
-	twine upload dist/*.tar.gz dist/*.whl --sign --verbose
+	twine upload dist/*.tar.gz dist/*.whl --verbose
 
 release-docs:
 	$(MAKE) docs

{argcomplete-3.1.2 → argcomplete-3.1.4}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "argcomplete"
 description = "Bash tab completion for argparse"
 readme = "README.rst"
-requires-python = ">=3.6"
+requires-python = ">=3.8"
 license = { text = "Apache Software License" }
 authors = [{ name = "Andrey Kislyuk"}, {email = "kislyuk@gmail.com" }]
 maintainers = []
@@ -24,6 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
   "Development Status :: 5 - Production/Stable",
@@ -32,7 +33,6 @@ classifiers = [
   "Topic :: System :: Shells",
   "Topic :: Terminals",
 ]
-dependencies = ["importlib-metadata >= 0.23, < 7; python_version < '3.8'"]
 
 [project.optional-dependencies]
 test = ["coverage", "pexpect", "wheel", "ruff", "mypy"]

{argcomplete-3.1.2 → argcomplete-3.1.4}/scripts/activate-global-python-argcomplete

@@ -13,6 +13,7 @@ import os
 import shutil
 import site
 import sys
+import subprocess
 
 import argcomplete
 
@@ -29,15 +30,22 @@ source "{activator}"
 """
 
 
+def get_local_dir():
+    try:
+        return subprocess.check_output(["brew", "--prefix"]).decode().strip()
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        return "/usr/local"
+
+
 def get_zsh_system_dir():
-    return "/usr/local/share/zsh/site-functions"
+    return f"{get_local_dir()}/share/zsh/site-functions"
 
 
 def get_bash_system_dir():
     if "BASH_COMPLETION_COMPAT_DIR" in os.environ:
         return os.environ["BASH_COMPLETION_COMPAT_DIR"]
     elif sys.platform == "darwin":
-        return "/usr/local/etc/bash_completion.d"  # created by homebrew
+        return f"{get_local_dir()}/etc/bash_completion.d"  # created by homebrew
     else:
         return "/etc/bash_completion.d"  # created by bash-completion
 
@@ -117,8 +125,7 @@ if args.dest:
     destinations.append(args.dest)
 elif site.ENABLE_USER_SITE and site.USER_SITE in argcomplete.__file__:
     print(
-        "Argcomplete was installed in the user site local directory. Defaulting to user installation.",
-        file=sys.stderr
+        "Argcomplete was installed in the user site local directory. Defaulting to user installation.", file=sys.stderr
     )
     link_user_rcfiles()
 elif sys.prefix != sys.base_prefix:

{argcomplete-3.1.2 → argcomplete-3.1.4}/test/test.py

@@ -1370,25 +1370,21 @@ class TestBashGlobal(TestBash):
             self.assertEqual(self.sh.run_command(command), "arg\r\n")
 
     @unittest.skipIf(os.uname()[0] == "Darwin", "Skip test that fails on MacOS")
-    @unittest.skipIf(sys.version_info < (3, 8), "Skip test that fails on Python 3.7 with importlib_metadata > 4")
     def test_console_script_module(self):
         """Test completing a console_script for a module."""
         self._test_console_script()
 
     @unittest.skipIf(os.uname()[0] == "Darwin", "Skip test that fails on MacOS")
-    @unittest.skipIf(sys.version_info < (3, 8), "Skip test that fails on Python 3.7 with importlib_metadata > 4")
     def test_console_script_package(self):
         """Test completing a console_script for a package."""
         self._test_console_script(package=True)
 
     @unittest.skipIf(os.uname()[0] == "Darwin", "Skip test that fails on MacOS")
-    @unittest.skipIf(sys.version_info < (3, 8), "Skip test that fails on Python 3.7 with importlib_metadata > 4")
     def test_console_script_module_wheel(self):
         """Test completing a console_script for a module from a wheel."""
         self._test_console_script(wheel=True)
 
     @unittest.skipIf(os.uname()[0] == "Darwin", "Skip test that fails on MacOS")
-    @unittest.skipIf(sys.version_info < (3, 8), "Skip test that fails on Python 3.7 with importlib_metadata > 4")
     def test_console_script_package_wheel(self):
         """Test completing a console_script for a package from a wheel."""
         self._test_console_script(package=True, wheel=True)

argcomplete-3.1.2/argcomplete.egg-info/requires.txt

@@ -1,10 +0,0 @@
-
-[:python_version < "3.8"]
-importlib-metadata<7,>=0.23
-
-[test]
-coverage
-pexpect
-wheel
-ruff
-mypy