From d4ab4b3749641bddd1f929eb41442c733f2f1807 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 23 Dec 2015 00:37:32 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I48feeb4b5f3a8d84fe0b5e7ab7360a9b5602829d --- requirements.txt | 8 ++++---- setup.py | 3 +-- test-requirements.txt | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements.txt b/requirements.txt index 5550ff333..ecd6188d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,14 +4,14 @@ pbr>=1.6 Babel>=1.3 -cliff>=1.14.0 # Apache-2.0 -ipaddress +cliff>=1.15.0 # Apache-2.0 +ipaddress>=1.0.7;python_version<'3.3' passlib>=1.6 -python-ironic-inspector-client>=1.0.1 +python-ironic-inspector-client>=1.3.0 os-cloud-config python-heatclient>=0.6.0 python-ironicclient>=0.8.0 -python-openstackclient>=1.5.0 +python-openstackclient>=2.0.0 six>=1.9.0 # tripleo-common lib is not yet on PyPi diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 736375744..782bb21f0 --- 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"); @@ -26,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 14ad75800..1ae958f96 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,13 +1,13 @@ # 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.2,<0.11 +hacking<0.11,>=0.10.2 coverage>=3.6 discover fixtures>=1.3.1 mock>=1.2 -oslosphinx>=2.5.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 testrepository>=0.0.18 testtools>=1.4.0