Merge "Updated from global requirements"

requirements.txt

@@ -2,20 +2,20 @@
 # 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
-SQLAlchemy>=0.9.7,<1.1.0
+pbr<2.0,>=0.11
+SQLAlchemy<1.1.0,>=0.9.7
 boto>=2.32.1
 decorator>=3.4.0
 eventlet>=0.17.3
-Jinja2>=2.6  # BSD License (3 clause)
+Jinja2>=2.6 # BSD License (3 clause)
 keystonemiddleware>=1.5.0
 lxml>=2.3
-Routes>=1.12.3,!=2.0
+Routes!=2.0,>=1.12.3
 WebOb>=1.2.3
 greenlet>=0.3.2
 PasteDeploy>=1.5.0
 Paste
-PrettyTable>=0.7,<0.8
+PrettyTable<0.8,>=0.7
 sqlalchemy-migrate>=0.9.6
 netaddr>=0.7.12
 netifaces>=0.10.4
@@ -23,28 +23,28 @@ paramiko>=1.13.0
 pyasn1
 Babel>=1.3
 iso8601>=0.1.9
-jsonschema>=2.0.0,<3.0.0,!=2.5.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
 python-cinderclient>=1.2.2
 python-keystoneclient>=1.6.0
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
 python-glanceclient>=0.18.0
 requests>=2.5.2
 six>=1.9.0
-stevedore>=1.5.0  # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
 setuptools
-websockify>=0.6.0,<0.7
-oslo.concurrency>=2.0.0         # Apache-2.0
-oslo.config>=1.11.0  # Apache-2.0
-oslo.context>=0.2.0                     # Apache-2.0
-oslo.log>=1.2.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
-oslo.db>=1.10.0  # Apache-2.0
-oslo.rootwrap>=2.0.0  # Apache-2.0
-oslo.messaging>=1.8.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-rfc3986>=0.2.0  # Apache-2.0
-oslo.middleware>=1.2.0,!=2.0.0                  # Apache-2.0
-psutil>=1.1.1,<2.0.0
+websockify<0.7,>=0.6.0
+oslo.concurrency>=2.0.0 # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.context>=0.2.0 # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+oslo.db>=1.10.0 # Apache-2.0
+oslo.rootwrap>=2.0.0 # Apache-2.0
+oslo.messaging>=1.8.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+rfc3986>=0.2.0 # Apache-2.0
+oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
+psutil<2.0.0,>=1.1.1
 oslo.versionedobjects>=0.3.0
 alembic>=0.7.2

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.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
 coverage>=3.6
 discover
 fixtures>=0.3.14
@@ -13,13 +13,13 @@ psycopg2
 python-barbicanclient>=3.0.1
 python-ironicclient>=0.2.1
 python-subunit>=0.0.18
-requests-mock>=0.6.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0  # Apache-2.0
-oslotest>=1.5.1  # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 tempest-lib>=0.5.0
 
 # vmwareapi driver specific dependencies
-oslo.vmware>=0.13.1                     # Apache-2.0
+oslo.vmware>=0.13.1 # Apache-2.0