From f3c05f9c011e947cac262ce27e0c9027eaa81698 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 30 Sep 2016 20:07:46 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ia0415718a0a6e8a7e486714be95b1033674f4af1 --- requirements.txt | 2 +- setup.py | 4 +++- test-requirements.txt | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index d7ca95f..97fc264 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ pbr>=1.6 # Apache-2.0 six>=1.9.0 # MIT libvirt-python>=1.2.5 # LGPLv2+ pyghmi>=1.0.9 # Apache-2.0 -PrettyTable>=0.7,<0.8 # BSD +PrettyTable<0.8,>=0.7.1 # BSD diff --git a/setup.py b/setup.py index 98b93eb..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -23,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 7c40c36..d239ee6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,17 +2,17 @@ # 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 # Apache-2.0 +hacking<0.11,>=0.10.2 # Apache-2.0 coverage>=3.6 # Apache-2.0 doc8 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 # BSD -oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0 +sphinx!=1.3b1,<1.4,>=1.2.1 # BSD +oslosphinx>=4.7.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT -os-testr>=0.4.1 # Apache-2.0 -mock>=1.2 # BSD +os-testr>=0.8.0 # Apache-2.0 +mock>=2.0 # BSD