Updated from global requirements

Change-Id: I5c0c7be5b031a8c0d2916eb502ce2007e631c3fe

requirements-py3.txt

@@ -3,32 +3,32 @@
 # process, which may cause wedges in the gate later.
 
 # keystone dependencies
-pbr>=0.6,!=0.7,<1.0
-WebOb>=1.2.3,<=1.3.1
+pbr!=0.7,<1.0,>=0.6
+WebOb<=1.3.1,>=1.2.3
 # Eventlet is considered dead for Py3
 # eventlet>=0.13.0
-greenlet>=0.3.2,<=0.4.2
-netaddr>=0.7.12,<=0.7.13
-PasteDeploy>=1.5.0,<=1.5.2
+greenlet<=0.4.2,>=0.3.2
+netaddr<=0.7.13,>=0.7.12
+PasteDeploy<=1.5.2,>=1.5.0
 Paste<=1.7.5.1
-Routes>=1.12.3,!=2.0,<=2.1
-six>=1.7.0,<=1.9.0
-SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
+Routes!=2.0,<=2.1,>=1.12.3
+six<=1.9.0,>=1.7.0
+SQLAlchemy!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6,<=0.9.99,>=0.8.4
 sqlalchemy-migrate==0.9.1
 passlib<=1.6.2
-iso8601>=0.1.9,<=0.1.10
-python-keystoneclient>=0.10.0,<1.2.0
-keystonemiddleware>=1.0.0,<1.4.0
-oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
+iso8601<=0.1.10,>=0.1.9
+python-keystoneclient<1.2.0,>=0.10.0
+keystonemiddleware<1.4.0,>=1.0.0
+oslo.config<=1.6.0,>=1.4.0 # Apache-2.0
 # oslo.messaging tries to pull in eventlet
 # oslo.messaging>=1.4.0.0a3
-oslo.db>=1.0.0,<1.1  # Apache-2.0
-oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-Babel>=1.3,<=1.3
-oauthlib>=0.6,<=0.7.2
-dogpile.cache>=0.5.3,<=0.5.6
-jsonschema>=2.0.0,<3.0.0
+oslo.db<1.1,>=1.0.0 # Apache-2.0
+oslo.i18n<=1.3.1,>=1.0.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+Babel<=1.3,>=1.3
+oauthlib<=0.7.2,>=0.6
+dogpile.cache<=0.5.6,>=0.5.3
+jsonschema<3.0.0,>=2.0.0
 # pycadf tries to pull in eventlet
 # pycadf>=0.5.1
-posix_ipc<=0.9.9
+posix-ipc<=0.9.9

requirements.txt

@@ -3,31 +3,31 @@
 # process, which may cause wedges in the gate later.
 
 # keystone dependencies
-pbr>=0.6,!=0.7,<1.0
-WebOb>=1.2.3,<=1.3.1
-eventlet>=0.15.1,<=0.15.2
-greenlet>=0.3.2,<=0.4.2
-netaddr>=0.7.12,<=0.7.13
-PasteDeploy>=1.5.0,<=1.5.2
+pbr!=0.7,<1.0,>=0.6
+WebOb<=1.3.1,>=1.2.3
+eventlet<=0.15.2,>=0.15.1
+greenlet<=0.4.2,>=0.3.2
+netaddr<=0.7.13,>=0.7.12
+PasteDeploy<=1.5.2,>=1.5.0
 Paste<=1.7.5.1
-Routes>=1.12.3,!=2.0,<=2.1
-six>=1.7.0,<=1.9.0
-SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
+Routes!=2.0,<=2.1,>=1.12.3
+six<=1.9.0,>=1.7.0
+SQLAlchemy!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6,<=0.9.99,>=0.8.4
 sqlalchemy-migrate==0.9.1
 passlib<=1.6.2
-iso8601>=0.1.9,<=0.1.10
-python-keystoneclient>=0.10.0,<1.2.0
-keystonemiddleware>=1.0.0,<1.4.0
-oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
-oslo.messaging>=1.4.0,<1.5.0
-oslo.db>=1.0.0,<1.1  # Apache-2.0
-oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0
+iso8601<=0.1.10,>=0.1.9
+python-keystoneclient<1.2.0,>=0.10.0
+keystonemiddleware<1.4.0,>=1.0.0
+oslo.config<=1.6.0,>=1.4.0 # Apache-2.0
+oslo.messaging<1.5.0,>=1.4.0
+oslo.db<1.1,>=1.0.0 # Apache-2.0
+oslo.i18n<=1.3.1,>=1.0.0 # Apache-2.0
 # only for Keystone tests running against keystoneclient master
-oslo.serialization>=1.0.0,<=1.2.0 # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-Babel>=1.3,<=1.3
-oauthlib>=0.6,<=0.7.2
-dogpile.cache>=0.5.3,<=0.5.6
-jsonschema>=2.0.0,<3.0.0
-pycadf>=0.6.0,!=0.6.2,<0.7.0  # Apache-2.0
-posix_ipc<=0.9.9
+oslo.serialization<=1.2.0,>=1.0.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+Babel<=1.3,>=1.3
+oauthlib<=0.7.2,>=0.6
+dogpile.cache<=0.5.6,>=0.5.3
+jsonschema<3.0.0,>=2.0.0
+pycadf!=0.6.2,<0.7.0,>=0.6.0 # Apache-2.0
+posix-ipc<=0.9.9

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");

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.9.2,<0.10
+hacking<0.10,>=0.9.2
 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.5,<3.0
+pymongo<3.0,>=2.5
 
 # Optional backend: LDAP
 # python-ldap does not install on py3
@@ -24,33 +24,33 @@ pymongo>=2.5,<3.0
 
 # Testing
 # computes code coverage percentages
-coverage>=3.6,<=3.7.1
+coverage<=3.7.1,>=3.6
 # fixture stubbing
-fixtures>=0.3.14,<=1.0.0
+fixtures<=1.0.0,>=0.3.14
 # xml parsing
-lxml>=2.3,<=3.3.3
+lxml<=3.3.3,>=2.3
 # mock object framework
-mock>=1.0,<=1.0.1
-oslotest>=1.1.0,<1.4.0  # Apache-2.0
+mock<=1.0.1,>=1.0
+oslotest<1.4.0,>=1.1.0 # Apache-2.0
 # required to build documentation
-sphinx>=1.1.2,!=1.2.0,<1.3
+sphinx!=1.2.0,<1.3,>=1.1.2
 # test wsgi apps without starting an http server
-WebTest>=2.0,<=2.0.18
+WebTest<=2.0.18,>=2.0
 
 # mox was removed in favor of mock. We should not re-enable this module. See
 # discussion: http://lists.openstack.org/pipermail/openstack-dev/2013-July/012484.html
 #mox>=0.5.3
 
 discover<=0.4.0
-python-subunit>=0.0.18,<=1.0.0
-testrepository>=0.0.18,<=0.0.20
-testtools>=0.9.34,!=1.4.0,<=1.5.0
-testscenarios>=0.4,<=0.4
+python-subunit<=1.0.0,>=0.0.18
+testrepository<=0.0.20,>=0.0.18
+testtools!=1.4.0,<=1.5.0,>=0.9.34
+testscenarios<=0.4,>=0.4
 
 # For documentation
-oslosphinx>=2.2.0,<2.5.0  # Apache-2.0
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
 
 # Used only by oslo
-kombu>=2.5.0,<=3.0.7
-lockfile>=0.8,<=0.8
-stevedore>=1.0.0,<=1.3.0 # Apache-2.0
+kombu<=3.0.15,>=2.5.0
+lockfile<=0.8,>=0.8
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0

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.9.2,<0.10
+hacking<0.10,>=0.9.2
 bashate>=0.2 # Apache-2.0
 
 # Optional backend: SQL
@@ -12,7 +12,7 @@ pysqlite<=2.6.3
 python-memcached>=1.48
 
 # Optional dogpile backend: MongoDB
-pymongo>=2.5,<3.0
+pymongo<3.0,>=2.5
 
 # Optional backend: LDAP
 # authenticate against an existing LDAP server
@@ -25,33 +25,33 @@ pysaml2
 
 # Testing
 # computes code coverage percentages
-coverage>=3.6,<=3.7.1
+coverage<=3.7.1,>=3.6
 # fixture stubbing
-fixtures>=0.3.14,<=1.0.0
+fixtures<=1.0.0,>=0.3.14
 # xml parsing
-lxml>=2.3,<=3.3.3
+lxml<=3.3.3,>=2.3
 # mock object framework
-mock>=1.0,<=1.0.1
-oslotest>=1.1.0,<1.4.0  # Apache-2.0
+mock<=1.0.1,>=1.0
+oslotest<1.4.0,>=1.1.0 # Apache-2.0
 # required to build documentation
-sphinx>=1.1.2,!=1.2.0,<1.3
+sphinx!=1.2.0,<1.3,>=1.1.2
 # test wsgi apps without starting an http server
-WebTest>=2.0,<=2.0.18
+WebTest<=2.0.18,>=2.0
 
 # mox was removed in favor of mock. We should not re-enable this module. See
 # discussion: http://lists.openstack.org/pipermail/openstack-dev/2013-July/012484.html
 #mox>=0.5.3
 
 discover<=0.4.0
-python-subunit>=0.0.18,<=1.0.0
-testrepository>=0.0.18,<=0.0.20
-testtools>=0.9.34,!=1.4.0,<=1.5.0
-testscenarios>=0.4,<=0.4
+python-subunit<=1.0.0,>=0.0.18
+testrepository<=0.0.20,>=0.0.18
+testtools!=1.4.0,<=1.5.0,>=0.9.34
+testscenarios<=0.4,>=0.4
 
 # For documentation
-oslosphinx>=2.2.0,<2.5.0  # Apache-2.0
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
 
 # Used only by oslo
-kombu>=2.5.0,<=3.0.7
-lockfile>=0.8,<=0.8
-stevedore>=1.0.0,<=1.3.0 # Apache-2.0
+kombu<=3.0.15,>=2.5.0
+lockfile<=0.8,>=0.8
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0