Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
v23.6.0
-------

* #575: Only require ``importlib_metadata`` on older Pythons.

v23.5.1
-------

Expand Down
7 changes: 4 additions & 3 deletions hook-keyring.backend.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Used by pyinstaller to expose hidden imports

import importlib_metadata as metadata
"""
Hook used by pyinstaller to expose hidden imports.
"""

from keyring.py310compat import metadata

hiddenimports = [ep.value for ep in metadata.entry_points(group='keyring.backends')]
3 changes: 1 addition & 2 deletions keyring/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@

from typing import Optional

import importlib_metadata as metadata

from .py310compat import metadata
from . import credentials, errors, util
from .util import properties

Expand Down
10 changes: 10 additions & 0 deletions keyring/py310compat.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import sys


__all__ = ['metadata']


if sys.version_info > (3, 10):
import importlib.metadata as metadata
else:
import importlib_metadata as metadata # type: ignore
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install_requires =
pywin32-ctypes!=0.1.0,!=0.1.1; sys_platform=="win32"
SecretStorage>=3.2; sys_platform=="linux"
jeepney>=0.4.2; sys_platform=="linux"
importlib_metadata >= 3.6
importlib_metadata >= 3.6; python_version < "3.10"

[options.packages.find]
exclude =
Expand Down
3 changes: 1 addition & 2 deletions tests/test_packaging.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import importlib_metadata as metadata

from keyring import backend
from keyring.py310compat import metadata


def test_entry_point():
Expand Down