From b5f98023e8b3b38b7500659b0c0f777be2f7f8e2 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 19 Nov 2015 15:44:19 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ic6465e5ead0a2699717cc748680939bd54739f2c --- requirements.txt | 4 ++-- setup.py | 2 +- test-requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3f20d16..5cd8199 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<2.0,>=1.4 +pbr>=1.6 argparse cmd2>=0.6.7 PrettyTable<0.8,>=0.7 pyparsing>=2.0.1 six>=1.9.0 stevedore>=1.5.0 # Apache-2.0 -unicodecsv>=0.8.0;python_version=='2.7' or python_version=='2.6' +unicodecsv>=0.8.0 PyYAML>=3.1.0 diff --git a/setup.py b/setup.py index d8080d0..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.3'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 38bfc9e..ab80b23 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,5 +6,5 @@ mock>=1.2 coverage>=3.6 # this is required for the docs build jobs sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -oslosphinx>=2.5.0 # Apache-2.0 +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 httplib2>=0.7.5