From f07d597e1eca3fb9366ee9c618e358c917a19177 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Wed, 8 Jul 2015 14:01:58 -0400 Subject: [PATCH] Update requirements. Signed-off-by: Chuck Short --- requirements.txt | 15 +++++++-------- setup.py | 1 - test-requirements.txt | 10 +++++----- 3 files changed, 12 insertions(+), 14 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements.txt b/requirements.txt index 8842255b..806b9dae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,12 +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.6,!=0.7,<1.0 +pbr<2.0,>=0.11 Babel>=1.3 -requests>=2.2.0,!=2.4.0 -oslo.config>=1.6.0 # Apache-2.0 -oslo.concurrency>=1.4.1 # Apache-2.0 -oslo.utils>=1.2.0 # Apache-2.0 -oslo.i18n>=1.3.0 # Apache-2.0 -oslo.log -pylxd +requests>=2.5.2 +oslo.config>=1.11.0 # Apache-2.0 +oslo.concurrency>=2.1.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.log>=1.2.0 # Apache-2.0 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 73637574..056c16c2 --- 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 e02d5443..079842e0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,14 +2,14 @@ # 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 python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.2.0 # Apache-2.0 -oslotest>=1.2.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0