From: OpenStack Proposal Bot Date: Mon, 22 Jun 2015 21:24:09 +0000 (+0000) Subject: Updated from global requirements X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=39ddcffcacbbf38fa1add2ad33547541db98c903;p=openstack-build%2Fcinder-build.git Updated from global requirements Change-Id: I9395058b42f3e28a267f0d82ae8dfcb663bdfb9b --- diff --git a/requirements.txt b/requirements.txt index ac1c8d18f..5a33b24a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,34 +2,34 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 anyjson>=0.3.3 Babel>=1.3 -eventlet>=0.17.3 +eventlet>=0.17.4 greenlet>=0.3.2 iso8601>=0.1.9 -Jinja2>=2.6 +Jinja2>=2.6 # BSD License (3 clause) keystonemiddleware>=1.5.0 kombu>=3.0.7 lxml>=2.3 netaddr>=0.7.12 -oslo.config>=1.11.0 # Apache-2.0 -oslo.concurrency>=2.0.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.db>=1.10.0 # Apache-2.0 -oslo.log>=1.2.0 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.middleware>=1.2.0,!=2.0.0 # Apache-2.0 -oslo.policy>=0.5.0 # Apache-2.0 -oslo.rootwrap>=2.0.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.concurrency>=2.0.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.db>=1.10.0 # Apache-2.0 +oslo.log>=1.2.0 # Apache-2.0 +oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0 +oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0 +oslo.policy>=0.5.0 # Apache-2.0 +oslo.rootwrap>=2.0.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 -osprofiler>=0.3.0 # Apache-2.0 +osprofiler>=0.3.0 # Apache-2.0 paramiko>=1.13.0 Paste PasteDeploy>=1.5.0 -psutil>=1.1.1,<2.0.0 +psutil<2.0.0,>=1.1.1 pycrypto>=2.6 pyparsing>=2.0.1 python-barbicanclient>=3.0.1 @@ -37,16 +37,16 @@ python-glanceclient>=0.18.0 python-novaclient>=2.22.0 python-swiftclient>=2.2.0 requests>=2.5.2 -retrying>=1.2.3,!=1.3.0 # Apache-2.0 -Routes>=1.12.3,!=2.0 -taskflow>=0.7.1 +retrying!=1.3.0,>=1.2.3 # Apache-2.0 +Routes!=2.0,>=1.12.3 +taskflow>=0.11.0 rtslib-fb>=2.1.41 six>=1.9.0 -SQLAlchemy>=0.9.7,<1.1.0 +SQLAlchemy<1.1.0,>=0.9.7 sqlalchemy-migrate>=0.9.6 -stevedore>=1.5.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 suds-jurko>=0.6 WebOb>=1.2.3 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.vmware>=0.13.1 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.vmware>=0.13.1 # Apache-2.0 os-brick diff --git a/setup.py b/setup.py index 736375744..056c16c2b 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 56622c74c..21650f189 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,13 +11,13 @@ discover fixtures>=0.3.14 mock>=1.0 mox3>=0.7.0 -PyMySQL>=0.6.2 # MIT License +PyMySQL>=0.6.2 # MIT License psycopg2 -oslotest>=1.5.1 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +oslotest>=1.5.1 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 python-subunit>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 testrepository>=0.0.18 -oslosphinx>=2.5.0 # Apache-2.0 +oslosphinx>=2.5.0 # Apache-2.0 os-testr>=0.1.0 tempest-lib>=0.5.0