Updated from global requirements

Change-Id: I7b50a27dbefbf00e76c837a56f5e456abbf6ab59

5 files changed, 104 insertions, 105 deletions

diff --git a/requirements-py3.txt b/requirements-py3.txt
index 7fca454e..ec4b13fb 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -2,39 +2,39 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-alembic>=0.6.4,<=0.7.4
-anyjson>=0.3.3,<=0.3.3
+alembic<=0.7.4,>=0.6.4
+anyjson<=0.3.3,>=0.3.3
 argparse
-croniter>=0.3.4,<=0.3.5 # MIT License
-eventlet>=0.15.1,<=0.15.2
-iso8601>=0.1.9,<=0.1.10
-jsonpath-rw>=1.2.0,<2.0
-jsonschema>=2.0.0,<3.0.0
-lockfile>=0.8,<=0.8
-lxml>=2.3,<=3.3.3
-msgpack-python>=0.4.0,<=0.4.5
-netaddr>=0.7.12,<=0.7.13
-oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
-oslo.db>=1.0.0,<1.1  # Apache-2.0
-PasteDeploy>=1.5.0,<=1.5.2
-pbr>=0.6,!=0.7,<1.0
-pecan>=0.5.0,<=0.8.3
-posix_ipc<=0.9.9
-oslo.messaging>=1.4.0,<1.5.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-pysnmp>=4.2.1,<5.0.0
-python-ceilometerclient>=1.0.6,<1.0.13
-python-glanceclient>=0.14.0,<=0.15.0
-python-keystoneclient>=0.10.0,<1.2.0
-python-neutronclient>=2.3.6,<2.4.0
-python-novaclient>=2.18.0,<=2.20.0
-python-swiftclient>=2.2.0,<=2.3.1
+croniter<=0.3.5,>=0.3.4 # MIT License
+eventlet<=0.15.2,>=0.15.1
+iso8601<=0.1.10,>=0.1.9
+jsonpath-rw<2.0,>=1.2.0
+jsonschema<3.0.0,>=2.0.0
+lockfile<=0.8,>=0.8
+lxml<=3.3.3,>=2.3
+msgpack-python<=0.4.5,>=0.4.0
+netaddr<=0.7.13,>=0.7.12
+oslo.config<=1.6.0,>=1.4.0 # Apache-2.0
+oslo.db<1.1,>=1.0.0 # Apache-2.0
+PasteDeploy<=1.5.2,>=1.5.0
+pbr!=0.7,<1.0,>=0.6
+pecan<=0.8.3,>=0.5.0
+posix-ipc<=0.9.9
+oslo.messaging<1.5.0,>=1.4.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+pysnmp<5.0.0,>=4.2.1
+python-ceilometerclient<1.0.13,>=1.0.6
+python-glanceclient<=0.15.0,>=0.14.0
+python-keystoneclient<1.2.0,>=0.10.0
+python-neutronclient<2.4.0,>=2.3.6
+python-novaclient<=2.20.0,>=2.18.0
+python-swiftclient<2.4.0,>=2.2.0
 pytz
-PyYAML>=3.1.0,<=3.10
-requests>=2.1.0,!=2.4.0,<=2.2.1
-six>=1.7.0,<=1.9.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
+PyYAML<=3.10,>=3.1.0
+requests!=2.4.0,<=2.2.1,>=2.1.0
+six<=1.9.0,>=1.7.0
+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
 sqlalchemy-migrate==0.9.1
-stevedore>=1.0.0,<=1.3.0 # Apache-2.0
-WebOb>=1.2.3,<=1.3.1
-WSME>=0.6,<=0.6.4
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0
+WebOb<=1.3.1,>=1.2.3
+WSME<=0.6.4,>=0.6
diff --git a/requirements.txt b/requirements.txt
index 6b019a79..94c4bb44 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,46 +2,46 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-alembic>=0.6.4,<=0.7.4
-anyjson>=0.3.3,<=0.3.3
+alembic<=0.7.4,>=0.6.4
+anyjson<=0.3.3,>=0.3.3
 argparse
-croniter>=0.3.4,<=0.3.5 # MIT License
-eventlet>=0.15.1,<=0.15.2
-happybase>=0.5,!=0.7,<=0.9
-iso8601>=0.1.9,<=0.1.10
-jsonpath-rw>=1.2.0,<2.0
-jsonschema>=2.0.0,<3.0.0
-keystonemiddleware>=1.0.0,<1.4.0
-lockfile>=0.8,<=0.8
-lxml>=2.3,<=3.3.3
-msgpack-python>=0.4.0,<=0.4.5
-netaddr>=0.7.12,<=0.7.13
+croniter<=0.3.5,>=0.3.4 # MIT License
+eventlet<=0.15.2,>=0.15.1
+happybase!=0.7,<=0.9,>=0.5
+iso8601<=0.1.10,>=0.1.9
+jsonpath-rw<2.0,>=1.2.0
+jsonschema<3.0.0,>=2.0.0
+keystonemiddleware<1.4.0,>=1.0.0
+lockfile<=0.8,>=0.8
+lxml<=3.3.3,>=2.3
+msgpack-python<=0.4.5,>=0.4.0
+netaddr<=0.7.13,>=0.7.12
 ordereddict<=1.1
-oslo.db>=1.0.0,<1.1  # Apache-2.0
-oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
-oslo.rootwrap>=1.3.0,<=1.5.0
-oslo.vmware>=0.6.0,<0.9.0               # Apache-2.0
-PasteDeploy>=1.5.0,<=1.5.2
-pbr>=0.6,!=0.7,<1.0
-pecan>=0.5.0,<=0.8.3
-posix_ipc<=0.9.9
-oslo.messaging>=1.4.0,<1.5.0
-oslo.serialization>=1.0.0,<=1.2.0 # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-pysnmp>=4.2.1,<5.0.0
-python-ceilometerclient>=1.0.6,<1.0.13
-python-glanceclient>=0.14.0,<=0.15.0
-python-keystoneclient>=0.10.0,<1.2.0
-python-neutronclient>=2.3.6,<2.4.0
-python-novaclient>=2.18.0,<=2.20.0
-python-swiftclient>=2.2.0,<=2.3.1
+oslo.db<1.1,>=1.0.0 # Apache-2.0
+oslo.config<=1.6.0,>=1.4.0 # Apache-2.0
+oslo.rootwrap<=1.5.0,>=1.3.0
+oslo.vmware<0.9.0,>=0.6.0 # Apache-2.0
+PasteDeploy<=1.5.2,>=1.5.0
+pbr!=0.7,<1.0,>=0.6
+pecan<=0.8.3,>=0.5.0
+posix-ipc<=0.9.9
+oslo.messaging<1.5.0,>=1.4.0
+oslo.serialization<=1.2.0,>=1.0.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+pysnmp<5.0.0,>=4.2.1
+python-ceilometerclient<1.0.13,>=1.0.6
+python-glanceclient<=0.15.0,>=0.14.0
+python-keystoneclient<1.2.0,>=0.10.0
+python-neutronclient<2.4.0,>=2.3.6
+python-novaclient<=2.20.0,>=2.18.0
+python-swiftclient<2.4.0,>=2.2.0
 pytz
-PyYAML>=3.1.0,<=3.10
-requests>=2.1.0,!=2.4.0,<=2.2.1
-six>=1.7.0,<=1.9.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
+PyYAML<=3.10,>=3.1.0
+requests!=2.4.0,<=2.2.1,>=2.1.0
+six<=1.9.0,>=1.7.0
+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
 sqlalchemy-migrate==0.9.1
-stevedore>=1.0.0,<=1.3.0 # Apache-2.0
-tooz>=0.3,<0.13 # Apache-2.0
-WebOb>=1.2.3,<=1.3.1
-WSME>=0.6,<=0.6.4
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0
+tooz<0.13,>=0.3 # Apache-2.0
+WebOb<=1.3.1,>=1.2.3
+WSME<=0.6.4,>=0.6
diff --git a/setup.py b/setup.py
index 73637574..056c16c2 100755..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-py3.txt b/test-requirements-py3.txt
index 633eb23f..cb20837b 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -3,23 +3,23 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.9.2,<0.10
-Babel>=1.3,<=1.3
-coverage>=3.6,<=3.7.1
+hacking<0.10,>=0.9.2
+Babel<=1.3,>=1.3
+coverage<=3.7.1,>=3.6
 discover<=0.4.0
-fixtures>=0.3.14,<=1.0.0
-httplib2>=0.7.5,<=0.9
-mock>=1.0,<=1.0.1
-mox>=0.5.3,<=0.5.3
+fixtures<=1.0.0,>=0.3.14
+httplib2<=0.9,>=0.7.5
+mock<=1.0.1,>=1.0
+mox<=0.5.3,>=0.5.3
 # Docs Requirements
-oslosphinx>=2.2.0,<2.5.0  # Apache-2.0
-oslotest>=1.1.0,<1.4.0  # Apache-2.0
-pymongo>=2.5,<3.0
-python-subunit>=0.0.18,<=1.0.0
-sphinx>=1.1.2,!=1.2.0,<1.3
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
+oslotest<1.4.0,>=1.1.0 # Apache-2.0
+pymongo<3.0,>=2.5
+python-subunit<=1.0.0,>=0.0.18
+sphinx!=1.2.0,<1.3,>=1.1.2
 sphinxcontrib-docbookrestapi<=0.2.1
 sphinxcontrib-httpdomain<=1.3.0
-sphinxcontrib-pecanwsme>=0.8,<=0.8.0
-testrepository>=0.0.18,<=0.0.20
-testscenarios>=0.4,<=0.4
-testtools>=0.9.34,!=1.4.0,<=1.5.0
+sphinxcontrib-pecanwsme<=0.8.0,>=0.8
+testrepository<=0.0.20,>=0.0.18
+testscenarios<=0.4,>=0.4
+testtools!=1.4.0,<=1.5.0,>=0.9.34
diff --git a/test-requirements.txt b/test-requirements.txt
index 7f54ca08..0a799fa2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,24 +3,24 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.9.2,<0.10
-Babel>=1.3,<=1.3
-coverage>=3.6,<=3.7.1
+hacking<0.10,>=0.9.2
+Babel<=1.3,>=1.3
+coverage<=3.7.1,>=3.6
 discover<=0.4.0
-fixtures>=0.3.14,<=1.0.0
-httplib2>=0.7.5,<=0.9
-mock>=1.0,<=1.0.1
-mox>=0.5.3,<=0.5.3
+fixtures<=1.0.0,>=0.3.14
+httplib2<=0.9,>=0.7.5
+mock<=1.0.1,>=1.0
+mox<=0.5.3,>=0.5.3
 MySQL-python<=1.2.3
 # Docs Requirements
-oslosphinx>=2.2.0,<2.5.0  # Apache-2.0
-oslotest>=1.1.0,<1.4.0  # Apache-2.0
-pymongo>=2.5,<3.0
-python-subunit>=0.0.18,<=1.0.0
-sphinx>=1.1.2,!=1.2.0,<1.3
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
+oslotest<1.4.0,>=1.1.0 # Apache-2.0
+pymongo<3.0,>=2.5
+python-subunit<=1.0.0,>=0.0.18
+sphinx!=1.2.0,<1.3,>=1.1.2
 sphinxcontrib-docbookrestapi<=0.2.1
 sphinxcontrib-httpdomain<=1.3.0
-sphinxcontrib-pecanwsme>=0.8,<=0.8.0
-testrepository>=0.0.18,<=0.0.20
-testscenarios>=0.4,<=0.4
-testtools>=0.9.34,!=1.4.0,<=1.5.0
+sphinxcontrib-pecanwsme<=0.8.0,>=0.8
+testrepository<=0.0.20,>=0.0.18
+testscenarios<=0.4,>=0.4
+testtools!=1.4.0,<=1.5.0,>=0.9.34