From c61c1dc15de0d7f26b49e35b794e2f2ede562209 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 8 Sep 2015 16:32:35 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Id947069b507db1700357b3e765f7ae1896a29a0b --- requirements.txt | 4 ++-- setup.py | 2 +- test-requirements.txt | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index ad3ae0b..dfc7593 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ # 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<2.0,>=0.11 +pbr<2.0,>=1.6 Babel>=1.3 -oslo.config>=1.11.0 # Apache-2.0 +oslo.config>=2.3.0 # Apache-2.0 httplib2>=0.7.5 iso8601>=0.1.9 requests>=2.5.2 diff --git a/setup.py b/setup.py index 056c16c..d8080d0 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.3'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 2ae420c..f2ebc04 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,9 +9,8 @@ fixtures>=1.3.1 python-subunit>=0.0.18 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 +oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 testtools>=1.4.0 -mock>=1.1;python_version!='2.6' -mock==1.0.1;python_version=='2.6' +mock>=1.2