diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-02 20:03:13 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-02 20:03:13 -0500 |
| commit | 8cd33fccc7384ef531731b6ddf87c19f7f768d20 (patch) | |
| tree | 2548f6f4a934f957673ca528aa6d7cb9b7689375 | |
| parent | 6f5c73fa83765d1d23552ee7ca0b68704409969f (diff) | |
| download | wheel-8cd33fccc7384ef531731b6ddf87c19f7f768d20.tar.gz | |
Update signatures to require keyrings.alt for improved compatibility with keyring 8.0
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | wheel/tool/__init__.py | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -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): |