Updated from global requirements

Change-Id: Iffef1faaad77d5cead0dfe671d73842ea7299459

requirements.txt

@@ -2,47 +2,47 @@
 # 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
 Babel>=1.3
-eventlet>=0.16.1,!=0.17.0
+eventlet!=0.17.0,>=0.16.1
 greenlet>=0.3.2
 httplib2>=0.7.5
 iso8601>=0.1.9
-keystonemiddleware>=1.5.0,<1.6.0
+keystonemiddleware<1.6.0,>=1.5.0
 kombu>=2.5.0
 lxml>=2.3
 netaddr>=0.7.12
-oslo.config>=1.9.3,<1.10.0  # Apache-2.0
-oslo.concurrency>=1.8.0,<1.9.0         # Apache-2.0
-oslo.context>=0.2.0,<0.3.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.messaging>=1.8.0,<1.9.0  # Apache-2.0
-oslo.middleware>=1.0.0,<1.1.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
-osprofiler>=0.3.0                       # Apache-2.0
-oslo.versionedobjects>=0.1.1,<0.2.0
+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0
+oslo.context<0.3.0,>=0.2.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.messaging<1.9.0,>=1.8.0 # Apache-2.0
+oslo.middleware<1.1.0,>=1.0.0 # 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
+osprofiler>=0.3.0 # Apache-2.0
+oslo.versionedobjects<0.2.0,>=0.1.1
 PasteDeploy>=1.5.0
-posix_ipc
+posix-ipc
 pycrypto>=2.6
-python-ceilometerclient>=1.0.13,<1.1.0
-python-cinderclient>=1.1.0,<1.2.0
-python-glanceclient>=0.15.0,<0.18.0
-python-heatclient>=0.3.0,<0.5.0
-python-keystoneclient>=1.1.0,<1.4.0
-python-neutronclient>=2.3.11,<2.5.0
-python-novaclient>=2.22.0,<2.24.0
-python-saharaclient>=0.8.0,<0.9.0
-python-swiftclient>=2.2.0,<2.5.0
-python-troveclient>=1.0.7,<1.1.0
+python-ceilometerclient<1.1.0,>=1.0.13
+python-cinderclient<1.2.0,>=1.1.0
+python-glanceclient<0.18.0,>=0.15.0
+python-heatclient<0.5.0,>=0.3.0
+python-keystoneclient<1.4.0,>=1.2.0
+python-neutronclient<2.5.0,>=2.3.11
+python-novaclient<2.24.0,>=2.22.0
+python-saharaclient<0.9.0,>=0.8.0
+python-swiftclient<2.5.0,>=2.2.0
+python-troveclient<1.1.0,>=1.0.7
 PyYAML>=3.1.0
 qpid-python
-requests>=2.2.0,!=2.4.0
-Routes>=1.12.3,!=2.0
+requests!=2.4.0,>=2.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
-stevedore>=1.3.0,<1.4.0  # Apache-2.0
+stevedore<1.4.0,>=1.3.0 # Apache-2.0
 WebOb>=1.2.3

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

@@ -6,14 +6,14 @@
 hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
-mock>=1.0
+mock<1.1.0,>=1.0
 mox>=0.5.3
 MySQL-python
-oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
-oslotest>=1.5.1,<1.6.0  # Apache-2.0
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
+oslotest<1.6.0,>=1.5.1 # Apache-2.0
 paramiko>=1.13.0
 psycopg2
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools!=1.2.0,>=0.9.36