Update from global requirements

Change-Id: Ia71570570f52d50677484fd47c82c8c127d7577a

requirements.txt

@@ -1,43 +1,42 @@
 # 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
-Babel>=1.3,<=1.3
-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
-alembic>=0.6.4,<=0.7.4
-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
+pbr!=0.7,<1.0,>=0.6
+Babel<=1.3,>=1.3
+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
+alembic<=0.7.4,>=0.6.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
 wsgiref>=0.1.2
 argparse
 ordereddict<=1.1
-kombu>=2.5.0,<=3.0.7
-lockfile>=0.8,<=0.8
-pycrypto>=2.6,<=2.6.1
-psutil>=1.1.1,<2.0.0
-iso8601>=0.1.9,<=0.1.10
-six>=1.7.0,<=1.9.0
-netaddr>=0.7.12,<=0.7.13
-PyYAML>=3.1.0,<=3.10
-jsonpatch>=1.1,<=1.3
-keystonemiddleware>=1.0.0,<1.4.0
+kombu<=3.0.15,>=2.5.0
+lockfile<=0.8,>=0.8
+pycrypto<=2.6.1,>=2.6
+psutil<2.0.0,>=1.1.1
+iso8601<=0.1.10,>=0.1.9
+six<=1.9.0,>=1.7.0
+netaddr<=0.7.13,>=0.7.12
+PyYAML<=3.10,>=3.1.0
+jsonpatch<=1.3,>=1.1
+keystonemiddleware<1.4.0,>=1.0.0
 
 # For paste.util.template used in keystone.common.template
-Paste
+Paste<=1.7.5.1
 
 passlib<=1.6.2
-jsonschema>=2.0.0,<3.0.0
-python-keystoneclient>=0.10.0,<1.2.0
-python-heatclient>=0.2.9,<0.3.0
-python-neutronclient>=2.3.6,<2.4.0
-oslo.db>=1.0.0,<1.1  # Apache-2.0
-oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
-oslo.messaging>=1.4.0,<1.5.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
+jsonschema<3.0.0,>=2.0.0
+python-keystoneclient<1.2.0,>=0.10.0
+python-heatclient<0.3.0,>=0.2.9
+python-neutronclient<2.4.0,>=2.3.6
+oslo.db<1.1,>=1.0.0 # Apache-2.0
+oslo.config<=1.6.0,>=1.4.0 # Apache-2.0
+oslo.messaging<1.5.0,>=1.4.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
 
 # not listed in global requirements
 yaql>=0.2.3,<0.3
-python-muranoclient>=0.5.5, <0.5.6
-
+python-muranoclient>=0.5.5,<0.5.6

test-requirements.txt

@@ -1,18 +1,18 @@
 # 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.2,<0.10
+hacking<0.10,>=0.9.2
 nose<=1.3.1
-coverage>=3.6,<=3.7.1
+coverage<=3.7.1,>=3.6
 discover<=0.4.0
-fixtures>=0.3.14,<=1.0.0
-mock>=1.0,<=1.0.1
-posix_ipc<=0.9.9
+fixtures<=1.0.0,>=0.3.14
+mock<=1.0.1,>=1.0
+posix-ipc<=0.9.9
 sqlalchemy-migrate==0.9.1
-testrepository>=0.0.18,<=0.0.20
-testresources>=0.2.4,<=0.2.7
-testscenarios>=0.4,<=0.4
-testtools>=0.9.34,!=1.4.0,<=1.5.0
+testrepository<=0.0.20,>=0.0.18
+testresources<=0.2.7,>=0.2.4
+testscenarios<=0.4,>=0.4
+testtools!=1.4.0,<=1.5.0,>=0.9.34
 unittest2<=0.8.0
 
 # Some of the tests use real MySQL and Postgres databases
@@ -20,4 +20,4 @@ MySQL-python<=1.2.3
 psycopg2<=2.6
 
 # doc build requirements
-sphinx>=1.1.2,!=1.2.0,<1.3
+sphinx!=1.2.0,<1.3,>=1.1.2