diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-13 18:33:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-13 18:33:26 +0000 |
| commit | 4a5903bce7cbe7e8384541b66020074b7fbe1702 (patch) | |
| tree | f6270b6c9606b99a39ca1b96ee2c050e20d3a3b2 | |
| parent | a8f31ccfbfdaa1b47fd3ce245744f241d68531bc (diff) | |
| parent | 61e4ebaa8003c5c5f353a571064fe91327a35d8b (diff) | |
| download | python-glanceclient-4a5903bce7cbe7e8384541b66020074b7fbe1702.tar.gz | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 7 | ||||
| -rw-r--r-- | test-requirements.txt | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index dfae8b7..cf13059 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,12 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. pbr>=0.6,!=0.7,<1.0 Babel>=1.3 argparse PrettyTable>=0.7,<0.8 -python-keystoneclient>=0.9.0 +python-keystoneclient>=0.10.0 pyOpenSSL>=0.11 -requests>=1.1 +requests>=1.2.1,!=2.4.0 warlock>=1.0.1,<2 six>=1.7.0 diff --git a/test-requirements.txt b/test-requirements.txt index 3064763..db9ba39 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,10 +1,13 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. hacking>=0.8.0,<0.9 coverage>=3.6 discover mox3>=0.7.0 mock>=1.0 -oslosphinx +oslosphinx>=2.2.0.0a2 sphinx>=1.1.2,!=1.2.0,<1.3 testrepository>=0.0.18 testtools>=0.9.34 |