From 2fb6611380703d4b0e818e833940d4a1248f328b Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 20:41:35 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ic52f681c0b93d8cdd21f9a2da64b9a23ddb9912e --- requirements.txt | 26 +++++++++++++------------- setup.py | 1 - test-requirements.txt | 8 ++++---- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index fdcefeab4f..6c1fd420f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,21 +1,21 @@ # 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 -eventlet>=0.17.3 +eventlet>=0.17.4 httplib2>=0.7.5 netaddr>=0.7.12 -retrying>=1.2.3,!=1.3.0 # Apache-2.0 -SQLAlchemy>=0.9.7,<1.1.0 +retrying!=1.3.0,>=1.2.3 # Apache-2.0 +SQLAlchemy<1.1.0,>=0.9.7 six>=1.9.0 -stevedore>=1.5.0 # Apache-2.0 -oslo.concurrency>=2.0.0 # Apache-2.0 -oslo.config>=1.11.0 # Apache-2.0 -oslo.db>=1.10.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.log>=1.2.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.4.0 # Apache-2.0 -oslo.vmware>=0.13.1 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 +oslo.concurrency>=2.0.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.db>=1.10.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.log>=1.2.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +oslo.vmware>=0.13.1 # Apache-2.0 tooz>=0.13.1 # Apache-2.0 diff --git a/setup.py b/setup.py index 736375744d..056c16c2b8 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 ff0669bc52..9880c1a06d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,17 +2,17 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.9.2,<0.10 +hacking<0.10,>=0.9.2 coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 testscenarios>=0.4 WebTest>=2.0 # This is needed for subunit-trace