Merge "Unpin keyring, just skip keyring 2.0"

This commit is contained in:
Jenkins 2013-12-30 20:18:10 +00:00 committed by Gerrit Code Review
commit df444f161d

View File

@ -122,7 +122,7 @@ hacking>=0.8.0,<0.9
hgtools # dependency of pytest-runner that is only in setup_requires
hp3parclient>=2.0,<3.0
httpretty>=0.7.1
keyring>=1.6.1,<2.0
keyring>=1.6.1,<2.0,>=2.1
mock>=1.0
mox>=0.5.3
mox3>=0.7.0