From 65762b2072d6e66f0be8503c998d4610c1883430 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 13 Jul 2015 14:59:47 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Iae3fade0921ee1a74e407b121ba09cf1c2591067 --- requirements-py3.txt | 32 ++++++++++++++++---------------- requirements.txt | 38 +++++++++++++++++++------------------- setup.py | 1 - test-requirements-py3.txt | 15 ++++++++------- test-requirements.txt | 16 ++++++++-------- 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/requirements-py3.txt b/requirements-py3.txt index 3780d5fa15..a943ee07ab 100644 --- a/requirements-py3.txt +++ b/requirements-py3.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.6,!=0.7,<1.0 +pbr!=0.7,<1.0,>=0.6 WebOb>=1.2.3 # Eventlet is considered dead for Py3 # eventlet>=0.16.1 @@ -10,29 +10,29 @@ greenlet>=0.3.2 netaddr>=0.7.12 PasteDeploy>=1.5.0 Paste -Routes>=1.12.3,!=2.0 +Routes!=2.0,>=1.12.3 six>=1.9.0 -SQLAlchemy>=0.9.7,<=0.9.99 +SQLAlchemy<=0.9.99,>=0.9.7 sqlalchemy-migrate>=0.9.5 passlib iso8601>=0.1.9 -python-keystoneclient>=1.1.0,<1.4.0 -keystonemiddleware>=1.5.0,<1.6.0 -oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 -oslo.config>=1.9.3,<1.10.0 # Apache-2.0 +python-keystoneclient<1.4.0,>=1.2.0 +keystonemiddleware<1.6.0,>=1.5.0 +oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0 +oslo.config<1.10.0,>=1.9.3 # Apache-2.0 # oslo.messaging tries to pull in eventlet # oslo.messaging>=1.6.0 # Apache-2.0 -oslo.db>=1.7.0,<1.8.0 # Apache-2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 -oslo.log>=1.0.0,<1.1.0 # Apache-2.0 -oslo.middleware>=1.0.0,<1.1.0 # Apache-2.0 -oslo.policy>=0.3.1,<0.4.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.db<1.8.0,>=1.7.0 # Apache-2.0 +oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0 +oslo.log<1.1.0,>=1.0.0 # Apache-2.0 +oslo.middleware<1.1.0,>=1.0.0 # Apache-2.0 +oslo.policy<0.4.0,>=0.3.1 # 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 oauthlib>=0.6 pysaml2 dogpile.cache>=0.5.3 -jsonschema>=2.0.0,<3.0.0 +jsonschema<3.0.0,>=2.0.0 # pycadf tries to pull in eventlet # pycadf>=0.6.0 -posix_ipc +posix-ipc diff --git a/requirements.txt b/requirements.txt index 87e1366420..6f6c26b4a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,36 +2,36 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.6,!=0.7,<1.0 +pbr!=0.7,<1.0,>=0.6 WebOb>=1.2.3 -eventlet>=0.16.1,!=0.17.0 +eventlet!=0.17.0,>=0.16.1 greenlet>=0.3.2 netaddr>=0.7.12 PasteDeploy>=1.5.0 Paste -Routes>=1.12.3,!=2.0 +Routes!=2.0,>=1.12.3 cryptography>=0.8 # Apache-2.0 six>=1.9.0 -SQLAlchemy>=0.9.7,<=0.9.99 +SQLAlchemy<=0.9.99,>=0.9.7 sqlalchemy-migrate>=0.9.5 passlib iso8601>=0.1.9 -python-keystoneclient>=1.1.0,<1.4.0 -keystonemiddleware>=1.5.0,<1.6.0 -oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 -oslo.config>=1.9.3,<1.10.0 # Apache-2.0 -oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 -oslo.db>=1.7.0,<1.8.0 # Apache-2.0 -oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 -oslo.log>=1.0.0,<1.1.0 # Apache-2.0 -oslo.middleware>=1.0.0,<1.1.0 # Apache-2.0 -oslo.policy>=0.3.1,<0.4.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 +python-keystoneclient<1.4.0,>=1.2.0 +keystonemiddleware<1.6.0,>=1.5.0 +oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0 +oslo.config<1.10.0,>=1.9.3 # Apache-2.0 +oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0 +oslo.db<1.8.0,>=1.7.0 # Apache-2.0 +oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0 +oslo.log<1.1.0,>=1.0.0 # Apache-2.0 +oslo.middleware<1.1.0,>=1.0.0 # Apache-2.0 +oslo.policy<0.4.0,>=0.3.1 # 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 oauthlib>=0.6 pysaml2 dogpile.cache>=0.5.3 -jsonschema>=2.0.0,<3.0.0 -pycadf>=0.8.0,<0.9.0 -posix_ipc +jsonschema<3.0.0,>=2.0.0 +pycadf<0.9.0,>=0.8.0 +posix-ipc msgpack-python>=0.4.0 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-py3.txt b/test-requirements-py3.txt index c29a820352..faa4988dc1 100644 --- a/test-requirements-py3.txt +++ b/test-requirements-py3.txt @@ -2,7 +2,7 @@ # 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 bashate>=0.2 # Apache-2.0 # pysqlite does not install on py3 @@ -14,7 +14,7 @@ bashate>=0.2 # Apache-2.0 # python-memcached>=1.48 # Optional dogpile backend: MongoDB -pymongo>=2.6.3,<3.0 +pymongo<3.0,>=2.6.3 # Optional backend: LDAP # python-ldap does not install on py3 @@ -23,6 +23,7 @@ pymongo>=2.6.3,<3.0 # ldappool>=1.0 # MPL -e git+https://github.com/rbarrois/python-ldap.git@py3#egg=python-ldap + # Testing # computes code coverage percentages coverage>=3.6 @@ -31,10 +32,10 @@ fixtures>=0.3.14 # xml parsing lxml>=2.3 # mock object framework -mock>=1.0 -oslotest>=1.5.1,<1.6.0 # Apache-2.0 +mock<1.1.0,>=1.0 +oslotest<1.6.0,>=1.5.1 # Apache-2.0 # required to build documentation -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # test wsgi apps without starting an http server WebTest>=2.0 @@ -45,8 +46,8 @@ WebTest>=2.0 discover python-subunit>=0.0.18 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools!=1.2.0,>=0.9.36 # For documentation -oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 +oslosphinx<2.6.0,>=2.5.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 73e5e40475..04c0440bf9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # 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 bashate>=0.2 # Apache-2.0 # Optional backend: SQL @@ -12,7 +12,7 @@ pysqlite python-memcached>=1.48 # Optional dogpile backend: MongoDB -pymongo>=2.6.3,<3.0 +pymongo<3.0,>=2.6.3 # Optional backend: LDAP # authenticate against an existing LDAP server @@ -27,10 +27,10 @@ fixtures>=0.3.14 # xml parsing lxml>=2.3 # mock object framework -mock>=1.0 -oslotest>=1.5.1,<1.6.0 # Apache-2.0 +mock<1.1.0,>=1.0 +oslotest<1.6.0,>=1.5.1 # Apache-2.0 # required to build documentation -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # test wsgi apps without starting an http server WebTest>=2.0 @@ -41,10 +41,10 @@ WebTest>=2.0 discover python-subunit>=0.0.18 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools!=1.2.0,>=0.9.36 # For documentation -oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 +oslosphinx<2.6.0,>=2.5.0 # Apache-2.0 -tempest-lib>=0.4.0,<0.5.0 +tempest-lib<0.5.0,>=0.4.0