From bf3e06e7918a2d7a26d402fff70e38d80d74f949 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 13 Jul 2015 15:02:28 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ifbd729a3c25ad3a9dc7f6719aa941fda96784309 --- requirements-py3.txt | 16 ++++++++-------- requirements.txt | 16 ++++++++-------- setup.py | 1 - test-requirements.txt | 10 +++++----- 4 files changed, 21 insertions(+), 22 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements-py3.txt b/requirements-py3.txt index 8b2aef5f..3faa000e 100644 --- a/requirements-py3.txt +++ b/requirements-py3.txt @@ -1,14 +1,14 @@ # 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. -eventlet>=0.16.1,!=0.17.0 +eventlet!=0.17.0,>=0.16.1 six>=1.9.0 Babel>=1.3 -oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 -oslo.context>=0.2.0,<0.3.0 # Apache-2.0 -oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 -oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 +oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0 +oslo.context<0.3.0,>=0.2.0 # Apache-2.0 +oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0 +oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0 +oslo.utils<1.5.0,>=1.4.0 # Apache-2.0 iso8601>=0.1.9 -oslo.log>=1.0.0,<1.1.0 # Apache-2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 +oslo.log<1.1.0,>=1.0.0 # Apache-2.0 +oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0 diff --git a/requirements.txt b/requirements.txt index e860b717..e0de07a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,14 +3,14 @@ # process, which may cause wedges in the gate later. six>=1.9.0 Babel>=1.3 -oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 -oslo.context>=0.2.0,<0.3.0 # Apache-2.0 -oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 -oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 -oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 +oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0 +oslo.context<0.3.0,>=0.2.0 # Apache-2.0 +oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0 +oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0 +oslo.utils<1.5.0,>=1.4.0 # Apache-2.0 iso8601>=0.1.9 -oslo.log>=1.0.0,<1.1.0 # Apache-2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 -mock>=1.0 +oslo.log<1.1.0,>=1.0.0 # Apache-2.0 +oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0 +mock<1.1.0,>=1.0 fixtures>=0.3.14 WebOb>=1.2.3 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 a8d0e615..b975e1c9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,9 +1,9 @@ # 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.5.6,<0.8 -oslotest>=1.5.1,<1.6.0 # Apache-2.0 -testtools>=0.9.36,!=1.2.0 +hacking<0.8,>=0.5.6 +oslotest<1.6.0,>=1.5.1 # Apache-2.0 +testtools!=1.2.0,>=0.9.36 # These are needed for docs generation -oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +oslosphinx<2.6.0,>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2