From a1cc26e5bab0c08baef210fc5bbe029609462900 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 17 Sep 2015 12:15:42 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I4e0f48228b4601f55a8439084d9913c4a8da0601 --- requirements.txt | 14 +++++++------- setup.py | 3 +-- test-requirements.txt | 12 ++++++------ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index 182c7f5..8bd14c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ # 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>=1.6 argparse Babel>=1.3 python-glanceclient>=0.18.0 -python-ironicclient>=0.2.1 +python-ironicclient>=0.8.0 python-keystoneclient>=1.6.0 -python-neutronclient>=2.3.11,<3 -python-novaclient>=2.22.0 -oslo.config>=1.11.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -pyOpenSSL>=0.11 +python-neutronclient>=2.6.0 +python-novaclient>=2.28.1 +oslo.config>=2.3.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +pyOpenSSL>=0.14 six>=1.9.0 diff --git a/setup.py b/setup.py index 7363757..782bb21 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"); @@ -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 7d47196..5ec1fdc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,15 +1,15 @@ # 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.9.2,<0.10 +hacking<0.10,>=0.9.2 coverage>=3.6 discover -fixtures>=0.3.14 -mock>=1.0 +fixtures>=1.3.1 +mock>=1.2 python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0