.github/workflows/main.yml

@@ -4,8 +4,11 @@ on:
   merge_group:
   push:
     branches-ignore:
-    # disabled for jaraco/skeleton#103
-    # - gh-readonly-queue/**  # Temporary merge queue-related GH-made branches
+    # temporary GH branches relating to merge queues (jaraco/skeleton#93)
+    - gh-readonly-queue/**
+    tags:
+    # required if branches-ignore is supplied (jaraco/skeleton#103)
+    - '**'
   pull_request:
 
 permissions:
@@ -31,7 +34,6 @@ jobs:
       matrix:
         python:
         - "3.8"
-        - "3.11"
         - "3.12"
         platform:
         - ubuntu-latest
@@ -42,6 +44,8 @@ jobs:
           platform: ubuntu-latest
         - python: "3.10"
           platform: ubuntu-latest
+        - python: "3.11"
+          platform: ubuntu-latest
         - python: pypy3.10
           platform: ubuntu-latest
     runs-on: ${{ matrix.platform }}

.readthedocs.yaml

@@ -10,3 +10,7 @@ build:
   os: ubuntu-lts-latest
   tools:
     python: latest
+  # post-checkout job to ensure the clone isn't shallow jaraco/skeleton#114
+  jobs:
+    post_checkout:
+    - git fetch --unshallow || true

NEWS.rst

@@ -1,3 +1,12 @@
+v25.0.1
+=======
+
+Bugfixes
+--------
+
+- When completion is unavailable, exit with non-zero status and emit message to stderr. (#671)
+
+
 v25.0.0
 =======
 

keyring/compat/py38.py

@@ -0,0 +1,9 @@
+import sys
+
+__all__ = ['files']
+
+
+if sys.version_info < (3, 9):
+    from importlib_resources import files
+else:
+    from importlib.resources import files

keyring/completion.py

@@ -6,16 +6,13 @@
 except ImportError:
     pass
 
-if sys.version_info < (3, 9):
-    from importlib_resources import files
-else:
-    from importlib.resources import files
+from .compat.py38 import files
 
 
 class _MissingCompletionAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string):
-        print("Install keyring[completion] for completion support.")
-        parser.exit(0)
+        print("Install keyring[completion] for completion support.", file=sys.stderr)
+        parser.exit(1)
 
 
 def add_completion_notice(parser):

pytest.ini

@@ -1,6 +1,9 @@
 [pytest]
 norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules
+addopts=
+	--doctest-modules
+	--import-mode importlib
+consider_namespace_packages=true
 filterwarnings=
 	## upstream
 

setup.cfg

@@ -30,7 +30,7 @@ install_requires =
 [options.extras_require]
 testing =
 	# upstream
-	pytest >= 6
+	pytest >= 6, != 8.1.1
 	pytest-checkdocs >= 2.4
 	pytest-cov
 	pytest-mypy

tests/test_multiprocess.py

@@ -1,12 +1,21 @@
 import multiprocessing
 import platform
-import sys
 
 import pytest
 
 import keyring
 
 
+@pytest.fixture(autouse=True)
+def workaround_pytest_12178(monkeypatch):
+    """
+    Ensure the current directory is on sys.path so that `tests` is importable.
+
+    Workaround for #673.
+    """
+    monkeypatch.syspath_prepend('.')
+
+
 def subprocess_get():
     keyring.get_password('test_app', 'test_user')
 
@@ -16,11 +25,6 @@ def subprocess_get():
         platform.system() == 'Linux',
         reason="#410: keyring discovery fails intermittently",
     ),
-    pytest.mark.skipif(
-        # always skip as it crashes the interpreter
-        sys.version_info < (3, 8) and platform.system() == 'Darwin',
-        reason="#281, #494: Prior to 3.8, multiprocess invocation fails",
-    ),
 ]