openstack/python-keystoneclient
Code Issues Proposed changes

Update keyring requirements

Browse Source 
As of commit 05c2bcef the minimum keyring version is 5.5.1,
so update the version that httpclient will use.

Change-Id: I877b9d40b8bc4f89754d64d29d82a9e3a3f2dd04
This commit is contained in:
Brant Knudson
2016-01-31 08:48:05 -06:00
parent 5c936fabe1
commit cc3aea176c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystoneclient/httpclient.py
View File

@@ -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