From b3198a77c0ec6149798da305b85dcada50cbd225 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 08:26:57 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ie3078b99f9d11bc9d8d04de0d55d9d929b1e46fb --- requirements.txt | 2 +- setup.py | 1 - test-requirements.txt | 12 ++++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0a26b08..b020ba8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ argparse netaddr>=0.7.12 six>=1.9.0 -stevedore>=1.5.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 7363757..056c16c 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 27f6050..9a8f505 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,15 +2,15 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 discover fixtures>=0.3.14 python-subunit>=0.0.18 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 -oslotest>=1.5.1 # Apache-2.0 +testtools>=1.4.0 +oslotest>=1.5.1 # Apache-2.0 # when we can require tox>= 1.4, this can go into tox.ini: # [testenv:cover] @@ -18,11 +18,11 @@ oslotest>=1.5.1 # Apache-2.0 coverage>=3.6 # this is required for the docs build jobs -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 # Required only for tests -oslo.i18n>=1.5.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 # mocking framework mock>=1.0