Updated from global requirements

Change-Id: Ib27fa36887592ceced91687e3edaacfd6f5f704e

requirements.txt

@@ -1,8 +1,8 @@
 # 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.11,<2.0
-SQLAlchemy>=0.9.7,<1.1.0
+pbr<2.0,>=0.11
+SQLAlchemy<1.1.0,>=0.9.7
 alembic>=0.7.2
 eventlet>=0.17.3
 lxml>=2.3
@@ -11,30 +11,30 @@ greenlet>=0.3.2
 netaddr>=0.7.12
 paramiko>=1.13.0
 iso8601>=0.1.9
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
 python-glanceclient>=0.18.0
 python-keystoneclient>=1.6.0
 python-swiftclient>=2.2.0
-stevedore>=1.5.0  # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
 pysendfile>=2.0.0
-websockify>=0.6.0,<0.7
-oslo.concurrency>=2.0.0         # Apache-2.0
-oslo.config>=1.11.0  # Apache-2.0
-oslo.context>=0.2.0                     # Apache-2.0
-oslo.db>=1.10.0  # Apache-2.0
-oslo.rootwrap>=2.0.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.log>=1.2.0  # Apache-2.0
-oslo.policy>=0.5.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
+websockify<0.7,>=0.6.0
+oslo.concurrency>=2.0.0 # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.context>=0.2.0 # Apache-2.0
+oslo.db>=1.10.0 # Apache-2.0
+oslo.rootwrap>=2.0.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
+oslo.policy>=0.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 pecan>=0.8.0
 requests>=2.5.2
 six>=1.9.0
 jsonpatch>=1.1
 WSME>=0.7
-Jinja2>=2.6  # BSD License (3 clause)
+Jinja2>=2.6 # BSD License (3 clause)
 keystonemiddleware>=1.5.0
-oslo.messaging>=1.8.0  # Apache-2.0
-retrying>=1.2.3,!=1.3.0 # Apache-2.0
-posix_ipc
+oslo.messaging>=1.8.0 # Apache-2.0
+retrying!=1.3.0,>=1.2.3 # Apache-2.0
+posix-ipc

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-py3.txt

@@ -1,22 +1,22 @@
 # 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
 coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
 Babel>=1.3
-oslotest>=1.5.1  # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
 psycopg2
-PyMySQL>=0.6.2  # MIT License
+PyMySQL>=0.6.2 # MIT License
 python-ironicclient>=0.2.1
 python-subunit>=0.0.18
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 
 # Doc requirements
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 sphinxcontrib-pecanwsme>=0.8
-oslosphinx>=2.5.0  # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
 

test-requirements.txt

@@ -1,22 +1,22 @@
 # 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
 coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
 Babel>=1.3
 MySQL-python
-oslotest>=1.5.1  # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
 psycopg2
 python-ironicclient>=0.2.1
 python-subunit>=0.0.18
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 
 # Doc requirements
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 sphinxcontrib-pecanwsme>=0.8
-oslosphinx>=2.5.0  # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0