diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-04 02:16:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-04 02:16:12 +0000 |
| commit | 53de2007c7d4f30876c5810a7b9decaecbc92414 (patch) | |
| tree | 2ea4bf1dc3fa536db06e9443c66a83a8728eddc4 | |
| parent | 24ed2381bba25c1e02518890364d579857335d41 (diff) | |
| parent | cc3aea176c2c047a08cbba7644d32cc6af4825b6 (diff) | |
| download | python-keystoneclient-53de2007c7d4f30876c5810a7b9decaecbc92414.tar.gz | |
Merge "Update keyring requirements"
| -rw-r--r-- | keystoneclient/httpclient.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py index 1286422..ccb5f30 100644 --- a/keystoneclient/httpclient.py +++ b/keystoneclient/httpclient.py @@ -38,8 +38,9 @@ try: # requirements. Update _min and _bad when that changes. keyring_v = pkg_resources.parse_version( pkg_resources.get_distribution("keyring").version) - keyring_min = pkg_resources.parse_version('2.1') - keyring_bad = (pkg_resources.parse_version('3.3'),) + keyring_min = pkg_resources.parse_version('5.5.1') + # This is a list of versions, e.g., pkg_resources.parse_version('3.3') + keyring_bad = [] if keyring_v >= keyring_min and keyring_v not in keyring_bad: import keyring |