Updated from global requirements

Change-Id: I6c863dbba067adbec2ef43f87c7dfef57ad07fc3

requirements.txt

@@ -3,45 +3,45 @@
 # process, which may cause wedges in the gate later.
 alembic>=0.7.2
 pecan>=0.8.0
-pbr>=0.11,<2.0
-SQLAlchemy>=0.9.7,<1.1.0
+pbr<2.0,>=0.11
+SQLAlchemy<1.1.0,>=0.9.7
 anyjson>=0.3.3
 Babel>=1.3
-eventlet>=0.17.3
+eventlet>=0.17.4
 requests>=2.5.2
 iso8601>=0.1.9
 jsonrpclib
 keystonemiddleware>=1.5.0
 netaddr>=0.7.12
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
 WebOb>=1.2.3
 six>=1.9.0
-stevedore>=1.5.0  # Apache-2.0
-oslo.config>=1.11.0  # Apache-2.0
-oslo.context>=0.2.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.messaging>=1.8.0  # Apache-2.0
-oslo.middleware>=1.2.0,!=2.0.0                  # Apache-2.0
-oslo.rootwrap>=2.0.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.4.0                       # Apache-2.0
-PyMySQL>=0.6.2  # MIT License
+stevedore>=1.5.0 # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.context>=0.2.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.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
+oslo.rootwrap>=2.0.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+PyMySQL>=0.6.2 # MIT License
 python-barbicanclient>=3.0.1
 python-keystoneclient>=1.6.0
 python-novaclient>=2.22.0
-posix_ipc
+posix-ipc
 pyOpenSSL>=0.11
 WSME>=0.7
 pyasn1
-pyasn1_modules
-Jinja2>=2.6  # BSD License (3 clause)
+pyasn1-modules
+Jinja2>=2.6 # BSD License (3 clause)
 paramiko>=1.13.0
 taskflow>=0.7.1
 networkx>=1.8
 
 #for the amphora api
-Flask>=0.10,<1.0
+Flask<1.0,>=0.10
 netifaces>=0.10.4
 

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

@@ -1,17 +1,17 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking>=0.9.1,<0.10
+hacking<0.10,>=0.9.1
 
-cliff>=1.10.0  # Apache-2.0
+cliff>=1.10.0 # Apache-2.0
 coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
 python-subunit>=0.0.18
 ordereddict
-oslotest>=1.5.1  # 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
 WebTest>=2.0
-doc8  # Apache-2.0
+doc8 # Apache-2.0