From d396816d716c0164327b815a249854a800e91ae8 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 08:21:50 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I7390158abb8207684d4e487b67f892eea0719d26 --- requirements.txt | 30 +++++++++++++++--------------- setup.py | 1 - test-requirements.txt | 10 +++++----- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/requirements.txt b/requirements.txt index 10e5b575f4..aad132be37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,37 +6,37 @@ # ascii betical order. Babel>=1.3 -PrettyTable>=0.7,<0.8 +PrettyTable<0.8,>=0.7 PyYAML>=3.1.0 -SQLAlchemy>=0.9.7,<1.1.0 +SQLAlchemy<1.1.0,>=0.9.7 WSME>=0.7 WebOb>=1.2.3 alembic>=0.7.2 -docker-py>=1.1.0 # Apache-2.0 +docker-py>=1.1.0 # Apache-2.0 eventlet>=0.17.3 greenlet>=0.3.2 iso8601>=0.1.9 jsonpatch>=1.1 keystonemiddleware>=1.5.0 netaddr>=0.7.12 -oslo.concurrency>=2.0.0 # Apache-2.0 -oslo.config>=1.11.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.db>=1.10.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.log>=1.2.0 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.policy>=0.5.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 +oslo.concurrency>=2.0.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.db>=1.10.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.log>=1.2.0 # Apache-2.0 +oslo.messaging>=1.8.0 # Apache-2.0 +oslo.policy>=0.5.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 oslo.versionedobjects>=0.3.0 paramiko>=1.13.0 -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 pecan>=0.8.0 python-glanceclient>=0.18.0 python-heatclient>=0.3.0 python-keystoneclient>=1.6.0 requests>=2.5.2 six>=1.9.0 -stevedore>=1.5.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 taskflow>=0.7.1 diff --git a/setup.py b/setup.py index 736375744d..056c16c2b8 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 9b4447fe26..fc88925014 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,13 +8,13 @@ coverage>=3.6 discover fixtures>=0.3.14 -hacking<0.11,>=0.10.0 # Apache-2.0 +hacking<0.11,>=0.10.0 # Apache-2.0 mock>=1.0 nose -oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.5.1 # Apache-2.0 +oslosphinx>=2.5.0 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0