diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-06-24 14:02:54 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-06-24 14:02:54 +0000 |
commit | 495402769e6c32405883ee2f16e2740d302a36f1 (patch) | |
tree | bf2ac72e33fac9ec9b8b3d2784273baba251153d | |
parent | 157097ef90b1fad48f8de90edb89010623148be5 (diff) | |
parent | cdeb275aefe5a5d19d1895e71ae6ce40cf837fda (diff) | |
download | ceilometermiddleware-495402769e6c32405883ee2f16e2740d302a36f1.tar.gz |
Merge "Updated from global requirements"
-rw-r--r-- | requirements.txt | 10 | ||||
-rw-r--r--[-rwxr-xr-x] | setup.py | 1 | ||||
-rw-r--r-- | test-requirements.txt | 10 |
3 files changed, 10 insertions, 11 deletions
diff --git a/requirements.txt b/requirements.txt index 431a81e..a61b1b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,11 +2,11 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -oslo.config>=1.11.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.utils>=1.4.0 # Apache-2.0 -pbr>=0.11,<2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +pbr<2.0,>=0.11 pycadf>=0.8.0 six>=1.9.0 Babel>=1.3 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test-requirements.txt b/test-requirements.txt index f142509..767cb3c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,14 +2,14 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 coverage>=3.6 discover python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.5.1 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 |