Updated from global requirements

Ran update-requirements in openstack/requirements.

Reverted change to python-ldap that used ;python=2.7

Change-Id: I45e4e3a0add6d50ea082d315c50a8647da71e282

requirements-py3.txt

@@ -2,35 +2,35 @@
 # 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
 WebOb>=1.2.3
-eventlet>=0.17.3
+eventlet>=0.17.4
 greenlet>=0.3.2
 PasteDeploy>=1.5.0
 Paste
-Routes>=1.12.3,!=2.0
+Routes!=2.0,>=1.12.3
 cryptography>=0.8.2 # Apache-2.0
 six>=1.9.0
-SQLAlchemy>=0.9.7,<=0.9.99
+SQLAlchemy<1.1.0,>=0.9.7
 sqlalchemy-migrate>=0.9.6
 passlib
 python-keystoneclient>=1.6.0
 keystonemiddleware>=1.5.0
-oslo.concurrency>=2.0.0         # Apache-2.0
-oslo.config>=1.11.0  # Apache-2.0
+oslo.concurrency>=2.1.0 # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
 # oslo.messaging tries to pull in eventlet
 # oslo.messaging>=1.6.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.middleware>=1.2.0,!=2.0.0                  # Apache-2.0
-oslo.policy>=0.5.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.service>=0.1.0
-oslo.utils>=1.4.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.middleware!=2.0.0,>=1.2.0 # Apache-2.0
+oslo.policy>=0.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.service>=0.1.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 oauthlib>=0.6
 pysaml2>=2.4.0
 dogpile.cache>=0.5.3
-jsonschema>=2.0.0,<3.0.0,!=2.5.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
 pycadf>=0.8.0
 msgpack-python>=0.4.0

requirements.txt

@@ -2,35 +2,35 @@
 # 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
 WebOb>=1.2.3
-eventlet>=0.17.3
+eventlet>=0.17.4
 greenlet>=0.3.2
 PasteDeploy>=1.5.0
 Paste
-Routes>=1.12.3,!=2.0
+Routes!=2.0,>=1.12.3
 cryptography>=0.8.2 # Apache-2.0
 six>=1.9.0
-SQLAlchemy>=0.9.7,<=0.9.99
+SQLAlchemy<1.1.0,>=0.9.7
 sqlalchemy-migrate>=0.9.6
-stevedore>=1.3.0  # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
 passlib
 python-keystoneclient>=1.6.0
 keystonemiddleware>=1.5.0
-oslo.concurrency>=2.0.0         # Apache-2.0
-oslo.config>=1.11.0  # Apache-2.0
-oslo.messaging>=1.8.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.middleware>=1.2.0,!=2.0.0                  # Apache-2.0
-oslo.policy>=0.5.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.service>=0.1.0
-oslo.utils>=1.4.0                       # Apache-2.0
+oslo.concurrency>=2.1.0 # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.messaging!=1.12.0,>=1.8.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.middleware!=2.0.0,>=1.2.0 # Apache-2.0
+oslo.policy>=0.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.service>=0.1.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 oauthlib>=0.6
 pysaml2>=2.4.0
 dogpile.cache>=0.5.3
-jsonschema>=2.0.0,<3.0.0,!=2.5.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
 pycadf>=0.8.0
 msgpack-python>=0.4.0

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.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
+pymongo>=3.0.2
 
 # Optional backend: LDAP
 # python-ldap does not install on py3
@@ -23,6 +23,7 @@ pymongo>=2.6.3
 # 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
@@ -32,9 +33,9 @@ fixtures>=0.3.14
 lxml>=2.3
 # mock object framework
 mock>=1.0
-oslotest>=1.5.1  # Apache-2.0
+oslotest>=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
 
@@ -44,10 +45,10 @@ WebTest>=2.0
 
 python-subunit>=0.0.18
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 
 # For documentation
-oslosphinx>=2.5.0  # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
 
 tempest-lib>=0.5.0
 

test-requirements.txt

@@ -2,14 +2,14 @@
 # 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: Memcache
 python-memcached>=1.48
 
 # Optional dogpile backend: MongoDB
-pymongo>=2.6.3
+pymongo>=3.0.2
 
 # Optional backend: LDAP
 # authenticate against an existing LDAP server
@@ -25,9 +25,9 @@ fixtures>=0.3.14
 lxml>=2.3
 # mock object framework
 mock>=1.0
-oslotest>=1.5.1  # Apache-2.0
+oslotest>=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
 
@@ -37,10 +37,10 @@ WebTest>=2.0
 
 python-subunit>=0.0.18
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 
 # For documentation
-oslosphinx>=2.5.0  # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
 
 tempest-lib>=0.5.0