From 8557cd9e1b432e671c3e546fa8d8484b4c934972 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 23 Jun 2015 21:50:00 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I81052418cf701d5fcda47491542d486f419cc19a --- requirements.txt | 10 +++++----- setup.py | 1 - test-requirements.txt | 12 ++++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index a7d5f8dda..6f3dafdd4 100644 --- a/requirements.txt +++ b/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. -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 argparse -cliff>=1.10.0 # Apache-2.0 +cliff>=1.13.0 # Apache-2.0 iso8601>=0.1.9 netaddr>=0.7.12 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 requests>=2.5.2 python-keystoneclient>=1.6.0 simplejson>=2.2.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 24c84a17e..dc5d2e715 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # 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 cliff-tablib>=1.0 coverage>=3.6 @@ -9,11 +9,11 @@ discover fixtures>=0.3.14 mox3>=0.7.0 mock>=1.0 -oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.5.1 # Apache-2.0 +oslosphinx>=2.5.0 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 python-subunit>=0.0.18 -requests-mock>=0.6.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +requests-mock>=0.6.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 tempest-lib>=0.5.0