From 76944b9ba0071868e290fcb9df81751c24389b6f Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 30 Jun 2015 20:01:51 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ifa681ffebd33f95d8e10dc6aa021e816bfdb1c70 --- requirements.txt | 16 ++++++++-------- setup.py | 1 - test-requirements.txt | 10 +++++----- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index d634a4bfc..69561fd17 100644 --- a/requirements.txt +++ b/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. -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 Babel>=1.3 -eventlet>=0.17.3 -oslo.concurrency>=2.0.0 # Apache-2.0 -oslo.log>=1.2.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 +eventlet>=0.17.4 +oslo.concurrency>=2.1.0 # Apache-2.0 +oslo.log>=1.2.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 oslo.service>=0.1.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 -retrying>=1.2.3,!=1.3.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +retrying!=1.3.0,>=1.2.3 # Apache-2.0 six>=1.9.0 diff --git a/setup.py b/setup.py index 736375744..056c16c2b 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 fd4182492..7544f1bd7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,13 +2,13 @@ # 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