diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-02 21:57:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-02 21:57:40 +0000 |
| commit | 87e0cb92b64838664a3e7f0e5bf5a4779c90d971 (patch) | |
| tree | b3ee56ce4bac9aa5bf30de255fe6ff9fee39f763 | |
| parent | 7dcc4880a2fdcb7586cb59dffedc558d693778c0 (diff) | |
| parent | eca06dad1cca344d249ad064e435d9e3be2eb1cd (diff) | |
| download | python-keystoneclient-87e0cb92b64838664a3e7f0e5bf5a4779c90d971.tar.gz | |
Merge "Updated from global requirements" into stable/liberty
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index b846bb3..0e58c7e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr<2.0,>=1.6 +pbr>=1.6 argparse Babel>=1.3 @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.3'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 7f4ea88..cf57f14 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,7 +16,7 @@ oslotest>=1.10.0 # Apache-2.0 pycrypto>=2.6 requests-mock>=0.6.0 # Apache-2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -tempest-lib>=0.6.1 +tempest-lib>=0.8.0 testrepository>=0.0.18 testresources>=0.2.4 testtools>=1.4.0 |