From 0702365088753ff2d5ae33ce6c6af15b00a57a10 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 20:00:41 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I43505ec0ecf807e48726e8bd94b414bba93999b5 --- requirements.txt | 6 +++--- setup.py | 1 - test-requirements.txt | 10 +++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 22499405..203e56f6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +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.11,<2.0 +pbr<2.0,>=0.11 argparse -PrettyTable>=0.7,<0.8 +PrettyTable<0.8,>=0.7 requests>=2.5.2 simplejson>=2.2.0 -oslo.utils>=1.6.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 python-keystoneclient>=1.6.0 Babel>=1.3 six>=1.9.0 diff --git a/setup.py b/setup.py index 73637574..056c16c2 100644 --- a/setup.py +++ b/setup.py @@ -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 bd8308a0..ac40ff64 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,14 +1,14 @@ # 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.10.0,<0.11 +hacking<0.11,>=0.10.0 coverage>=3.6 discover -oslosphinx>=2.5.0 # Apache-2.0 -requests-mock>=0.6.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +oslosphinx>=2.5.0 # Apache-2.0 +requests-mock>=0.6.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 mock>=1.0 httplib2>=0.7.5