From cf5b410704260a688f4d61a8fbf15987cae33bc6 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 08:27:09 +0000 Subject: Updated from global requirements Change-Id: I9ceca37d91690cbb66ad8789b9a72a92cd450170 --- requirements.txt | 10 +++++----- setup.py | 1 - test-requirements.txt | 10 +++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1f58426..6079b4d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,11 +2,11 @@ # 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<2.0,>=0.11 Babel>=1.3 -oslo.config>=1.11.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 six>=1.9.0 -stevedore>=1.5.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 WebOb>=1.2.3 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 52cc789..962a842 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,10 +3,10 @@ # process, which may cause wedges in the gate later. fixtures>=0.3.14 -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 mock>=1.0 -oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.5.1 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -testtools>=0.9.36,!=1.2.0 +oslosphinx>=2.5.0 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +testtools>=1.4.0 coverage>=3.6 -- cgit v1.2.1