Updated from global requirements

Change-Id: I37d3d83c0d664909980e92224a7318bfa96c4cd5

requirements.txt

@@ -2,59 +2,59 @@
 # 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
 #
 # The greenlet package must be compiled with gcc and needs
 # the Python.h headers. Make sure you install the python-dev
 # package to get the right headers...
-greenlet>=0.3.2,<=0.4.2
+greenlet<=0.4.2,>=0.3.2
 
 # < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
-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
-anyjson>=0.3.3,<=0.3.3
-eventlet>=0.15.1,<=0.15.2
-PasteDeploy>=1.5.0,<=1.5.2
-Routes>=1.12.3,!=2.0,<=2.1
-WebOb>=1.2.3,<=1.3.1
+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
+anyjson<=0.3.3,>=0.3.3
+eventlet<=0.15.2,>=0.15.1
+PasteDeploy<=1.5.2,>=1.5.0
+Routes!=2.0,<=2.1,>=1.12.3
+WebOb<=1.3.1,>=1.2.3
 argparse
-boto>=2.32.1,<2.35.0
+boto<2.35.0,>=2.32.1
 sqlalchemy-migrate==0.9.1
-httplib2>=0.7.5,<=0.9
-kombu>=2.5.0,<=3.0.7
-pycrypto>=2.6,<=2.6.1
-iso8601>=0.1.9,<=0.1.10
+httplib2<=0.9,>=0.7.5
+kombu<=3.0.7,>=2.5.0
+pycrypto<=2.6.1,>=2.6
+iso8601<=0.1.10,>=0.1.9
 ordereddict<=1.1
-oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
-stevedore>=1.0.0,<=1.3.0 # Apache-2.0
-netaddr>=0.7.12,<=0.7.13
-keystonemiddleware>=1.0.0,<1.4.0
-WSME>=0.6,<=0.6.4
+oslo.config<=1.6.0,>=1.4.0 # Apache-2.0
+stevedore<=1.3.0,>=1.0.0 # Apache-2.0
+netaddr<=0.7.13,>=0.7.12
+keystonemiddleware<1.4.0,>=1.0.0
+WSME<=0.6.4,>=0.6
 # For openstack/common/lockutils
-posix_ipc<=0.9.9
+posix-ipc<=0.9.9
 
 # For Swift storage backend.
-python-swiftclient>=2.2.0,<=2.3.1
+python-swiftclient<=2.3.1,>=2.2.0
 
 # For VMware storage backed.
-oslo.vmware>=0.6.0,<0.9.0               # Apache-2.0
+oslo.vmware<0.9.0,>=0.6.0 # Apache-2.0
 
 # For paste.util.template used in keystone.common.template
 Paste<=1.7.5.1
 
-jsonschema>=2.0.0,<3.0.0
-python-cinderclient>=1.1.0,<=1.1.1
-python-keystoneclient>=0.10.0,<1.2.0
-pyOpenSSL>=0.11,<=0.13
+jsonschema<3.0.0,>=2.0.0
+python-cinderclient<=1.1.1,>=1.1.0
+python-keystoneclient<1.2.0,>=0.10.0
+pyOpenSSL<=0.13,>=0.11
 
 # Required by openstack.common libraries
-six>=1.7.0,<=1.9.0
+six<=1.9.0,>=1.7.0
 
-oslo.db>=1.0.0,<1.1  # Apache-2.0
-oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0
-oslo.messaging>=1.4.0,<1.5.0
+oslo.db<1.1,>=1.0.0 # Apache-2.0
+oslo.i18n<=1.3.1,>=1.0.0 # Apache-2.0
+oslo.messaging<1.5.0,>=1.4.0
 
-retrying>=1.2.2,!=1.3.0,<=1.3.3 # Apache-2.0
-osprofiler>=0.3.0,<=0.3.0 # Apache-2.0
+retrying!=1.3.0,<=1.3.3,>=1.2.2 # Apache-2.0
+osprofiler<=0.3.0,>=0.3.0 # Apache-2.0
 
 # Glance Store
-glance_store>=0.1.1,<=0.1.10 # Apache-2.0
+glance-store<=0.1.10,>=0.1.1 # Apache-2.0

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

@@ -3,29 +3,29 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.8.0,<0.9
+hacking<0.9,>=0.8.0
 
 # For translations processing
-Babel>=1.3,<=1.3
+Babel<=1.3,>=1.3
 
 # Needed for testing
-coverage>=3.6,<=3.7.1
+coverage<=3.7.1,>=3.6
 discover<=0.4.0
-fixtures>=0.3.14,<=1.0.0
-mox>=0.5.3,<=0.5.3
-mock>=1.0,<=1.0.1
-sphinx>=1.1.2,!=1.2.0,<1.3
-requests>=2.1.0,!=2.4.0,<=2.2.1
-testrepository>=0.0.18,<=0.0.20
-testtools>=0.9.34,!=1.4.0,<=1.5.0
-psutil>=1.1.1,<2.0.0
+fixtures<=1.0.0,>=0.3.14
+mox<=0.5.3,>=0.5.3
+mock<=1.0.1,>=1.0
+sphinx!=1.2.0,<1.3,>=1.1.2
+requests!=2.4.0,<=2.2.1,>=2.1.0
+testrepository<=0.0.20,>=0.0.18
+testtools!=1.4.0,<=1.5.0,>=0.9.34
+psutil<2.0.0,>=1.1.1
 
 # Optional packages that should be installed when testing
 MySQL-python<=1.2.3
 psycopg2<=2.6
 pysendfile==2.0.0
 qpid-python<=0.26.1
-xattr>=0.4,<=0.6.4
+xattr<=0.6.4,>=0.4
 
 # Documentation
-oslosphinx>=2.2.0,<2.5.0  # Apache-2.0
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0