From aacc17957b82ab79630004660f2ae6167acb575d Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 28 Jul 2015 21:32:35 +0000 Subject: Updated from global requirements Change-Id: I344731dfb898d4d53461e4d9be6c27ad0c752274 --- requirements.txt | 10 +++++----- setup.py | 1 - test-requirements.txt | 14 +++++++------- 3 files changed, 12 insertions(+), 13 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements.txt b/requirements.txt index 0e6b90d..1bdc95f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -Babel>=1.3,<=1.3 -oslo.config>=1.4.0,<=1.6.0 # Apache-2.0 -oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0 -six>=1.7.0,<=1.9.0 -WebOb>=1.2.3,<=1.3.1 +Babel<=1.3,>=1.3 +oslo.config<=1.6.0,>=1.4.0 # Apache-2.0 +oslo.i18n<=1.3.1,>=1.0.0 # Apache-2.0 +six<=1.9.0,>=1.7.0 +WebOb<=1.3.1,>=1.2.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 8db2b51..52fe5b3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,10 +2,10 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -fixtures>=0.3.14,<=1.0.0 -hacking>=0.9.2,<0.10 -mock>=1.0,<=1.0.1 -oslosphinx>=2.2.0,<2.5.0 # Apache-2.0 -oslotest>=1.1.0,<1.4.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,<1.3 -testtools>=0.9.34,!=1.4.0,<=1.5.0 +fixtures<=1.0.0,>=0.3.14 +hacking<0.10,>=0.9.2 +mock<=1.0.1,>=1.0 +oslosphinx<2.5.0,>=2.2.0 # Apache-2.0 +oslotest<1.4.0,>=1.1.0 # Apache-2.0 +sphinx!=1.2.0,<1.3,>=1.1.2 +testtools!=1.4.0,<=1.5.0,>=0.9.34 -- cgit v1.2.1