Updated from global requirements

Change-Id: I2e04a524bd60b0abad462c37140a23e98fc5a369

3 files changed, 38 insertions, 38 deletions

diff --git a/requirements.txt b/requirements.txt
index 04f28da2..b9777f5b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,34 +1,34 @@
 # 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
-SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
-eventlet>=0.15.1,<=0.15.2
-keystonemiddleware>=1.0.0,<1.4.0
-kombu>=2.5.0,<=3.0.7
-Routes>=1.12.3,!=2.0,<=2.1
-WebOb>=1.2.3,<=1.3.1
-PasteDeploy>=1.5.0,<=1.5.2
+pbr!=0.7,<1.0,>=0.6
+SQLAlchemy!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6,<=0.9.99,>=0.8.4
+eventlet<=0.15.2,>=0.15.1
+keystonemiddleware<1.4.0,>=1.0.0
+kombu<=3.0.15,>=2.5.0
+Routes!=2.0,<=2.1,>=1.12.3
+WebOb<=1.3.1,>=1.2.3
+PasteDeploy<=1.5.2,>=1.5.0
 Paste<=1.7.5.1
 sqlalchemy-migrate==0.9.1
-netaddr>=0.7.12,<=0.7.13
-netifaces>=0.10.4,<=0.10.4
-httplib2>=0.7.5,<=0.9
-lxml>=2.3,<=3.3.3
+netaddr<=0.7.13,>=0.7.12
+netifaces<=0.10.4,>=0.10.4
+httplib2<=0.9,>=0.7.5
+lxml<=3.3.3,>=2.3
 passlib<=1.6.2
-python-heatclient>=0.2.9,<0.3.0
-python-novaclient>=2.18.0,<=2.20.0
-python-cinderclient>=1.1.0,<=1.1.1
-python-keystoneclient>=0.10.0,<=1.1.0
-python-swiftclient>=2.2.0,<=2.3.1
-python-designateclient>=1.0.0,<=1.1.1
-python-neutronclient>=2.3.6,<2.4.0
-iso8601>=0.1.9,<=0.1.10
-jsonschema>=2.0.0,<3.0.0
+python-heatclient<0.3.0,>=0.2.9
+python-novaclient<=2.20.0,>=2.18.0
+python-cinderclient<=1.1.1,>=1.1.0
+python-keystoneclient<1.2.0,>=0.10.0
+python-swiftclient<=2.3.1,>=2.2.0
+python-designateclient<=1.1.1,>=1.0.0
+python-neutronclient<2.4.0,>=2.3.6
+iso8601<=0.1.10,>=0.1.9
+jsonschema<3.0.0,>=2.0.0
 Jinja2<=2.7.2
-pexpect>=3.1,<=3.3 # ISC License
-oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
+pexpect<=3.3,>=3.1 # ISC License
+oslo.config<=1.6.0,>=1.4.0 # Apache-2.0
 MySQL-python<=1.2.3
-Babel>=1.3,<=1.3
-six>=1.7.0,<=1.9.0
-stevedore>=1.0.0,<=1.2.0 # Apache-2.0
+Babel<=1.3,>=1.3
+six<=1.9.0,>=1.7.0
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 73637574..056c16c2 100644
--- a/setup.py
+++ b/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");
diff --git a/test-requirements.txt b/test-requirements.txt
index 4cdd1075..36d91a71 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,22 +2,23 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.8.0,<0.9
-sphinx>=1.1.2,!=1.2.0,<1.3
-oslosphinx>=2.2.0,<2.5.0  # Apache-2.0
+hacking<0.9,>=0.8.0
+sphinx!=1.2.0,<1.3,>=1.1.2
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
 
-coverage>=3.6,<=3.7.1
+coverage<=3.7.1,>=3.6
 nose<=1.3.1
 nosexcover
 openstack-doc-tools>=0.18.1
-openstack.nose_plugin>=0.7
-WebTest>=2.0,<=2.0.18
-wsgi_intercept>=0.6.1,<=0.9.1 # MIT License
+openstack.nose-plugin>=0.7
+WebTest<=2.0.18,>=2.0
+wsgi-intercept<=0.9.1,>=0.6.1 # MIT License
 proboscis==1.2.5.3
 http://tarballs.openstack.org/python-troveclient/python-troveclient-master.tar.gz#egg=python-troveclient
-mock>=1.0,<=1.0.1
-mox3>=0.7.0,<=0.7.0
-testtools>=0.9.34,!=1.4.0,<=1.5.0
+
+mock<=1.0.1,>=1.0
+mox3<=0.7.0,>=0.7.0
+testtools!=1.4.0,<=1.5.0,>=0.9.34
 discover<=0.4.0
-testrepository>=0.0.18,<=0.0.20
+testrepository<=0.0.20,>=0.0.18