python-wheel/remove-keyrings.alt-dependency.patch

30 lines
1.1 KiB
Diff
Raw Normal View History

2016-09-19 09:18:21 +00:00
diff --git a/setup.py b/setup.py
index bd1c900..9579fac 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ setup(name='wheel',
],
extras_require={
':python_version=="2.6"': ['argparse'],
- 'signatures': ['keyring', 'keyrings.alt'],
+ 'signatures': ['keyring'],
'signatures:sys_platform!="win32"': ['pyxdg'],
'signatures:python_version=="2.6"': ['importlib'],
'faster-signatures': ['ed25519ll'],
diff --git a/wheel/tool/__init__.py b/wheel/tool/__init__.py
index 4c0187b..81eae0e 100644
--- a/wheel/tool/__init__.py
+++ b/wheel/tool/__init__.py
@@ -29,9 +29,8 @@ def get_keyring():
try:
from ..signatures import keys
import keyring
- assert keyring.get_keyring().priority
- except (ImportError, AssertionError):
- raise WheelError("Install wheel[signatures] (requires keyring, keyrings.alt, pyxdg) for signatures.")
+ except ImportError:
+ raise WheelError("Install wheel[signatures] (requires keyring, pyxdg) for signatures.")
return keys.WheelKeys, keyring
def keygen(get_keyring=get_keyring):