From cdeb275aefe5a5d19d1895e71ae6ce40cf837fda Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 23 Jun 2015 21:41:23 +0000 Subject: Updated from global requirements Change-Id: I691b788b399ff1ed0255c5881d95c382d5f6951e --- requirements.txt | 10 +++++----- setup.py | 1 - test-requirements.txt | 10 +++++----- 3 files changed, 10 insertions(+), 11 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements.txt b/requirements.txt index 431a81e..a61b1b9 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. -oslo.config>=1.11.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.utils>=1.4.0 # Apache-2.0 -pbr>=0.11,<2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +pbr<2.0,>=0.11 pycadf>=0.8.0 six>=1.9.0 Babel>=1.3 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 7363757..056c16c --- 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 f142509..767cb3c 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.10.0,<0.11 +hacking<0.11,>=0.10.0 coverage>=3.6 discover python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -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 +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 -- cgit v1.2.1