Updated from global requirements

Change-Id: If28d82ea69ad761f02042d17ca5b1e6efa71d64a

requirements.txt

@@ -1,23 +1,23 @@
 # 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.
-pbr>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
 
-eventlet>=0.16.1,!=0.17.0
-requests>=2.2.0,!=2.4.0
+eventlet!=0.17.0,>=0.16.1
+requests!=2.4.0,>=2.2.0
 netaddr>=0.7.12
-SQLAlchemy>=0.9.7,<=0.9.99
+SQLAlchemy<=0.9.99,>=0.9.7
 alembic>=0.7.2
 six>=1.9.0
-oslo.config>=1.9.3,<1.10.0  # Apache-2.0
-oslo.db>=1.7.0,<1.8.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.serialization>=1.4.0,<1.5.0               # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
-python-barbicanclient>=3.0.1,<3.1.0
+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+oslo.db<1.8.0,>=1.7.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.serialization<1.5.0,>=1.4.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+python-barbicanclient<3.1.0,>=3.0.1
 pyasn1
-pyasn1_modules
+pyasn1-modules
 pyOpenSSL>=0.11
 
 # This project does depend on neutron as a library, but the

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,24 +1,24 @@
 # 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.10.0,<0.11
+hacking<0.11,>=0.10.0
 
-cliff>=1.10.0,<1.11.0  # Apache-2.0
+cliff<1.11.0,>=1.10.0 # Apache-2.0
 coverage>=3.6
 discover
 fixtures>=0.3.14
-mock>=1.0
+mock<1.1.0,>=1.0
 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,<2.6.0  # Apache-2.0
-oslo.concurrency>=1.8.0,<1.9.0         # Apache-2.0
-tempest-lib>=0.4.0,<0.5.0
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
+oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0
+tempest-lib<0.5.0,>=0.4.0
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools!=1.2.0,>=0.9.36
 testscenarios>=0.4
 WebOb>=1.2.3
 WebTest>=2.0
-oslotest>=1.5.1,<1.6.0  # Apache-2.0
+oslotest<1.6.0,>=1.5.1 # Apache-2.0
 psycopg2
 MySQL-python