From ae1957afc9c43986e3ec67cc36cffe1c54ee8681 Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Fri, 26 Jun 2015 16:40:40 +0300 Subject: [PATCH] Update from global-requirements Change-Id: Ibe89c301c1f91b92ac9c2a6ed5d9e03f43c011b9 --- requirements.txt | 38 +++++++++++++++++++------------------- setup.py | 1 - test-requirements.txt | 16 ++++++++-------- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/requirements.txt b/requirements.txt index 696999e18..04c887fdd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,41 +1,41 @@ # 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. -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 Babel>=1.3 -SQLAlchemy>=0.9.7,<1.1.0 -stevedore>=1.5.0 # Apache-2.0 +SQLAlchemy<1.1.0,>=0.9.7 +stevedore>=1.5.0 # Apache-2.0 alembic>=0.7.2 -eventlet>=0.17.3 +eventlet>=0.17.4 PasteDeploy>=1.5.0 -Routes>=1.12.3,!=2.0 +Routes!=2.0,>=1.12.3 WebOb>=1.2.3 kombu>=3.0.7 -psutil>=1.1.1,<2.0.0 +psutil<2.0.0,>=1.1.1 iso8601>=0.1.9 six>=1.9.0 netaddr>=0.7.12 PyYAML>=3.1.0 jsonpatch>=1.1 keystonemiddleware>=1.5.0 +yaql>=0.2.6,<0.3 # Apache 2.0 License # For paste.util.template used in keystone.common.template Paste -jsonschema>=2.0.0,<3.0.0,!=2.5.0 +jsonschema!=2.5.0,<3.0.0,>=2.0.0 python-keystoneclient>=1.6.0 python-heatclient>=0.3.0 -python-neutronclient>=2.3.11,<3 -oslo.db>=1.10.0 # Apache-2.0 -oslo.config>=1.11.0 # Apache-2.0 -oslo.policy>=0.5.0 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.4.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 +python-neutronclient<3,>=2.3.11 +python-muranoclient>=0.5.6 +python-congressclient>=1.0.0 +oslo.db>=1.10.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.policy>=0.5.0 # Apache-2.0 +oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 # not listed in global requirements -yaql>=0.2.6,<0.3 -python-muranoclient>=0.5.6 -python-mistralclient>=0.1.1 -python-congressclient>=1.0.2 +python-mistralclient!=1.0.0.0b1,>=1.0.0 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 9ef38640b..5ac671408 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,29 +1,29 @@ # 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.10.0,<0.11 +hacking<0.11,>=0.10.0 coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 nose -oslotest>=1.5.1 # Apache-2.0 -posix_ipc +oslotest>=1.5.1 # Apache-2.0 +posix-ipc sqlalchemy-migrate>=0.9.6 tempest-lib>=0.5.0 testrepository>=0.0.18 testresources>=0.2.4 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 unittest2 -pylint==1.4.1 # GNU GPL v2 +pylint==1.4.1 # GNU GPL v2 # Some of the tests use real MySQL and Postgres databases -PyMySQL>=0.6.2 # MIT License +PyMySQL>=0.6.2 # MIT License psycopg2 # doc build requirements -oslosphinx>=2.5.0 # Apache-2.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 sphinxcontrib-httpdomain