diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2016-01-31 08:48:05 -0600 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2016-01-31 08:48:05 -0600 |
| commit | cc3aea176c2c047a08cbba7644d32cc6af4825b6 (patch) | |
| tree | 76a0f8f05fd12012e418319d609320945e97ceeb /keystoneclient/httpclient.py | |
| parent | 5c936fabe1b6ae0acccdc2587d45fa7dd09de321 (diff) | |
| download | python-keystoneclient-cc3aea176c2c047a08cbba7644d32cc6af4825b6.tar.gz | |
Update keyring requirements
As of commit 05c2bcef the minimum keyring version is 5.5.1,
so update the version that httpclient will use.
Change-Id: I877b9d40b8bc4f89754d64d29d82a9e3a3f2dd04
Diffstat (limited to 'keystoneclient/httpclient.py')
| -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 |