Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed importlib_metadata to have requirement for < python 3.10 #577

Merged
merged 10 commits into from Jun 5, 2022
7 changes: 5 additions & 2 deletions hook-keyring.backend.py
@@ -1,6 +1,9 @@
# Used by pyinstaller to expose hidden imports
import sys

import importlib_metadata as metadata

if sys.version_info >= (3, 10):
from importlib import metadata
else:
import importlib_metadata as metadata # type: ignore

hiddenimports = [ep.value for ep in metadata.entry_points(group='keyring.backends')]
6 changes: 5 additions & 1 deletion keyring/backend.py
Expand Up @@ -8,8 +8,12 @@
import operator

from typing import Optional
import sys

import importlib_metadata as metadata
if sys.version_info >= (3, 10):
from importlib import metadata
else:
import importlib_metadata as metadata # type: ignore

from . import credentials, errors, util
from .util import properties
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
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
6 changes: 5 additions & 1 deletion tests/test_packaging.py
@@ -1,5 +1,9 @@
import importlib_metadata as metadata
import sys

if sys.version_info >= (3, 10):
from importlib import metadata
else:
import importlib_metadata as metadata # type: ignore
from keyring import backend


Expand Down