From c7a05f6ff0c50d5ed5d55df8066a7026621461c0 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 08:27:43 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I9b0d8338be3ac1b6e123e2c9bf8fd733c9fba745 --- 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 2dcb2db6..72a83b1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,13 +3,13 @@ # process, which may cause wedges in the gate later. Babel>=1.3 -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 argparse iso8601>=0.1.9 -PrettyTable>=0.7,<0.8 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 +PrettyTable<0.8,>=0.7 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 python-keystoneclient>=1.6.0 python-swiftclient>=2.2.0 PyYAML>=3.1.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 a4bba485..a24e0f1c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,17 +3,17 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 coverage>=3.6 discover fixtures>=0.3.14 -requests-mock>=0.6.0 # Apache-2.0 +requests-mock>=0.6.0 # Apache-2.0 mock>=1.0 mox3>=0.7.0 -oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.5.1 # Apache-2.0 -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 tempest-lib>=0.5.0 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0