Merge pull request #577 from probro27/main

Changed importlib_metadata to have requirement for < python 3.10

CHANGES.rst

@@ -1,3 +1,8 @@
+v23.6.0
+-------
+
+* #575: Only require ``importlib_metadata`` on older Pythons.
+
 v23.5.1
 -------
 

hook-keyring.backend.py

@@ -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')]

keyring/backend.py

@@ -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
 

keyring/py310compat.py

@@ -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

setup.cfg

@@ -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 =

tests/test_packaging.py

@@ -1,6 +1,5 @@
-import importlib_metadata as metadata
-
 from keyring import backend
+from keyring.py310compat import metadata
 
 
 def test_entry_point():