.coveragerc

@@ -7,3 +7,7 @@ disable_warnings =
 
 [report]
 show_missing = True
+exclude_also =
+	# jaraco/skeleton#97
+	@overload
+	if TYPE_CHECKING:

.github/workflows/main.yml

@@ -1,6 +1,12 @@
 name: tests
 
-on: [push, pull_request]
+on:
+  merge_group:
+  push:
+    branches-ignore:
+    # disabled for jaraco/skeleton#103
+    # - gh-readonly-queue/**  # Temporary merge queue-related GH-made branches
+  pull_request:
 
 permissions:
   contents: read
@@ -36,61 +42,49 @@ jobs:
           platform: ubuntu-latest
         - python: "3.10"
           platform: ubuntu-latest
-        - python: pypy3.9
+        - python: pypy3.10
           platform: ubuntu-latest
     runs-on: ${{ matrix.platform }}
-    continue-on-error: ${{ matrix.python == '3.12' }}
+    continue-on-error: ${{ matrix.python == '3.13' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
       - name: Install tox
-        run: |
-          python -m pip install tox
+        run: python -m pip install tox
       - name: Run
         run: tox
 
-  diffcov:
+  collateral:
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+        - diffcov
+        - docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
           python-version: 3.x
       - name: Install tox
-        run: |
-          python -m pip install tox
-      - name: Evaluate coverage
-        run: tox
-        env:
-          TOXENV: diffcov
-
-  docs:
-    runs-on: ubuntu-latest
-    env:
-      TOXENV: docs
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Python
-        uses: actions/setup-python@v4
-      - name: Install tox
-        run: |
-          python -m pip install tox
-      - name: Run
-        run: tox
+        run: python -m pip install tox
+      - name: Eval ${{ matrix.job }}
+        run: tox -e ${{ matrix.job }}
 
   check:  # This job does nothing and is only used for the branch protection
     if: always()
 
     needs:
     - test
-    - docs
+    - collateral
 
     runs-on: ubuntu-latest
 
@@ -109,14 +103,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
           python-version: 3.x
       - name: Install tox
-        run: |
-          python -m pip install tox
+        run: python -m pip install tox
       - name: Run
         run: tox -e release
         env:

.pre-commit-config.yaml

@@ -1,5 +1,6 @@
 repos:
-- repo: https://github.com/psf/black
-  rev: 22.6.0
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.1.8
   hooks:
-  - id: black
+  - id: ruff
+  - id: ruff-format

.readthedocs.yaml

@@ -7,6 +7,6 @@ python:
 
 # required boilerplate readthedocs/readthedocs.org#10401
 build:
-  os: ubuntu-22.04
+  os: ubuntu-lts-latest
   tools:
-    python: "3"
+    python: latest

NEWS.rst

@@ -1,3 +1,12 @@
+v24.3.1
+=======
+
+Bugfixes
+--------
+
+- Minor fixes to account for emergent typing and linter concerns.
+
+
 v24.3.0
 =======
 

README.rst

@@ -3,22 +3,18 @@
 
 .. image:: https://img.shields.io/pypi/pyversions/keyring.svg
 
-.. image:: https://github.com/jaraco/keyring/workflows/tests/badge.svg
+.. image:: https://github.com/jaraco/keyring/actions/workflows/main.yml/badge.svg
    :target: https://github.com/jaraco/keyring/actions?query=workflow%3A%22tests%22
    :alt: tests
 
 .. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
     :target: https://github.com/astral-sh/ruff
     :alt: Ruff
 
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-   :target: https://github.com/psf/black
-   :alt: Code style: Black
-
 .. image:: https://readthedocs.org/projects/keyring/badge/?version=latest
    :target: https://keyring.readthedocs.io/en/latest/?badge=latest
 
-.. image:: https://img.shields.io/badge/skeleton-2023-informational
+.. image:: https://img.shields.io/badge/skeleton-2024-informational
    :target: https://blog.jaraco.com/skeleton
 
 .. image:: https://tidelift.com/badges/package/pypi/keyring
@@ -176,9 +172,6 @@ use cases. Simply install them to make them available:
 
 - `keyrings.cryptfile <https://pypi.org/project/keyrings.cryptfile>`_
   - Encrypted text file storage.
-- `keyring_jeepney <https://pypi.org/project/keyring_jeepney>`__ - a
-  pure Python backend using the secret service DBus API for desktop
-  Linux.
 - `keyrings.alt <https://pypi.org/project/keyrings.alt>`_ - "alternate",
   possibly-insecure backends, originally part of the core package, but
   available for opt-in.
@@ -197,6 +190,9 @@ use cases. Simply install them to make them available:
   - OSX keychain key-management, for private, public, and symmetric keys.
 - `keyring_pass.PasswordStoreBackend <https://github.com/nazarewk/keyring_pass>`_
    - Password Store (pass) backend for python's keyring 
+- `keyring_jeepney <https://pypi.org/project/keyring_jeepney>`__ - a
+  pure Python backend using the secret service DBus API for desktop
+  Linux (requires ``keyring<24``).
 
 
 Write your own keyring backend

keyring/_compat.py

@@ -4,4 +4,4 @@
 try:
     from jaraco.classes import properties  # pragma: no-cover
 except ImportError:
-    from . import _properties_compat as properties  # pragma: no-cover
+    from . import _properties_compat as properties  # type: ignore[no-redef] # pragma: no-cover

keyring/backend.py

@@ -1,6 +1,7 @@
 """
 Keyring implementation support
 """
+
 from __future__ import annotations
 
 import os
@@ -46,7 +47,7 @@ def __init__(self):
         self.set_properties_from_env()
 
     @properties.classproperty
-    def priority(self) -> typing.Union[int, float]:
+    def priority(self) -> float:
         """
         Each backend class must supply a priority, a number (float or integer)
         indicating the priority of the backend relative to all other backends.

keyring/backends/SecretService.py

@@ -30,7 +30,7 @@ class Keyring(backend.SchemeSelectable, KeyringBackend):
     appid = 'Python keyring library'
 
     @properties.classproperty
-    def priority(cls) -> int:
+    def priority(cls) -> float:
         with ExceptionRaisedContext() as exc:
             secretstorage.__name__
         if exc:

keyring/backends/Windows.py

@@ -81,7 +81,7 @@ class WinVaultKeyring(KeyringBackend):
     persist = Persistence()
 
     @properties.classproperty
-    def priority(cls) -> int:
+    def priority(cls) -> float:
         """
         If available, the preferred backend on Windows.
         """

keyring/backends/chainer.py

@@ -2,6 +2,7 @@
 Keyring Chainer - iterates over other viable backends to
 discover passwords in each.
 """
+
 from .. import backend
 from .._compat import properties
 from . import fail
@@ -18,7 +19,7 @@ class ChainerBackend(backend.KeyringBackend):
     viable = True
 
     @properties.classproperty
-    def priority(cls) -> int:
+    def priority(cls) -> float:
         """
         If there are backends to chain, high priority
         Otherwise very low priority since our operation when empty

keyring/backends/fail.py

@@ -15,7 +15,7 @@ class Keyring(KeyringBackend):
     """
 
     @properties.classproperty
-    def priority(cls) -> int:
+    def priority(cls) -> float:
         return 0
 
     def get_password(self, service, username, password=None):

keyring/backends/libsecret.py

@@ -43,7 +43,7 @@ def schema(self):
             ),
         )
 
-    @properties.NonDataProperty
+    @properties.NonDataProperty  # type: ignore
     def collection(self):
         return Secret.COLLECTION_DEFAULT
 

keyring/backends/macOS/api.py

@@ -82,9 +82,9 @@ def create_query(**kwargs):
     return CFDictionaryCreate(
         None,
         (c_void_p * len(kwargs))(*[k_(k) for k in kwargs.keys()]),
-        (c_void_p * len(kwargs))(
-            *[create_cfstr(v) if isinstance(v, str) else v for v in kwargs.values()]
-        ),
+        (c_void_p * len(kwargs))(*[
+            create_cfstr(v) if isinstance(v, str) else v for v in kwargs.values()
+        ]),
         len(kwargs),
         _found.kCFTypeDictionaryKeyCallBacks,
         _found.kCFTypeDictionaryValueCallBacks,

keyring/backends/null.py

@@ -11,7 +11,7 @@ class Keyring(KeyringBackend):
     """
 
     @properties.classproperty
-    def priority(cls) -> int:
+    def priority(cls) -> float:
         return -1
 
     def get_password(self, service, username, password=None):

keyring/cli.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Simple command line interface to get/set password from a keyring"""
 
 import getpass
@@ -134,8 +133,15 @@ def pass_from_pipe(cls):
 
     @staticmethod
     def strip_last_newline(str):
-        """Strip one last newline, if present."""
-        return str[: -str.endswith('\n')]
+        r"""Strip one last newline, if present.
+
+        >>> CommandLineTool.strip_last_newline('foo')
+        'foo'
+        >>> CommandLineTool.strip_last_newline('foo\n')
+        'foo'
+        """
+        slc = slice(-1 if str.endswith('\n') else None)
+        return str[slc]
 
 
 def main(argv=None):

keyring/completion.py

@@ -36,8 +36,12 @@ def get_action(parser, option):
 
 def install_completion(parser):
     preamble = dict(
-        bash=files(__package__).joinpath('backend_complete.bash').read_text(),
-        zsh=files(__package__).joinpath('backend_complete.zsh').read_text(),
+        bash=files(__package__)
+        .joinpath('backend_complete.bash')
+        .read_text(encoding='utf-8'),
+        zsh=files(__package__)
+        .joinpath('backend_complete.zsh')
+        .read_text(encoding='utf-8'),
     )
     shtab.add_argument_to(parser, preamble=preamble)
     get_action(parser, '--keyring-path').complete = shtab.DIR

pyproject.toml

@@ -2,7 +2,4 @@
 requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"]
 build-backend = "setuptools.build_meta"
 
-[tool.black]
-skip-string-normalization = true
-
 [tool.setuptools_scm]

pytest.ini

@@ -7,14 +7,6 @@ filterwarnings=
 	# Ensure ResourceWarnings are emitted
 	default::ResourceWarning
 
-	# shopkeep/pytest-black#55
-	ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
-	ignore:The \(fspath. py.path.local\) argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning
-	ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning
-
-	# shopkeep/pytest-black#67
-	ignore:'encoding' argument not specified::pytest_black
-
 	# realpython/pytest-mypy#152
 	ignore:'encoding' argument not specified::pytest_mypy
 
@@ -24,4 +16,7 @@ filterwarnings=
 	# pypa/build#615
 	ignore:'encoding' argument not specified::build.env
 
+	# dateutil/dateutil#1284
+	ignore:datetime.datetime.utcfromtimestamp:DeprecationWarning:dateutil.tz.tz
+
 	## end upstream

ruff.toml

@@ -0,0 +1,24 @@
+[lint]
+ignore = [
+	# https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
+	"W191",
+	"E111",
+	"E114",
+	"E117",
+	"D206",
+	"D300",
+	"Q000",
+	"Q001",
+	"Q002",
+	"Q003",
+	"COM812",
+	"COM819",
+	"ISC001",
+	"ISC002",
+]
+
+[format]
+# Enable preview, required for quote-style = "preserve"
+preview = true
+# https://docs.astral.sh/ruff/settings/#format-quote-style
+quote-style = "preserve"