From 8cd33fccc7384ef531731b6ddf87c19f7f768d20 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 2 Feb 2016 20:03:13 -0500 Subject: Update signatures to require keyrings.alt for improved compatibility with keyring 8.0 --- setup.py | 2 +- wheel/tool/__init__.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 62cd584..24957ca 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ setup(name='wheel', ], extras_require={ ':python_version=="2.6"': ['argparse'], - 'signatures': ['keyring'], + 'signatures': ['keyring', 'keyrings.alt'], 'signatures:sys_platform!="win32"': ['pyxdg'], 'faster-signatures': ['ed25519ll'], 'tool': [] diff --git a/wheel/tool/__init__.py b/wheel/tool/__init__.py index 389e619..95f0a9b 100644 --- a/wheel/tool/__init__.py +++ b/wheel/tool/__init__.py @@ -29,8 +29,9 @@ def get_keyring(): try: from ..signatures import keys import keyring - except ImportError: - raise WheelError("Install wheel[signatures] (requires keyring, pyxdg) for signatures.") + assert keyring.get_keyring().priority + except (ImportError, AssertionError): + raise WheelError("Install wheel[signatures] (requires keyring, keyrings.alt, pyxdg) for signatures.") return keys.WheelKeys, keyring def keygen(get_keyring=get_keyring): -- cgit v1.2.1