Updated from global requirements

Change-Id: I4e26965afd4209b3ee6425ab95507727ab0cc188

requirements.txt

@@ -2,9 +2,9 @@
 # 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
+pbr<2.0,>=0.11
 
-stevedore>=1.5.0  # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
 netaddr>=0.7.12
 
 # for timeutils
@@ -13,8 +13,8 @@ iso8601>=0.1.9
 # for jsonutils
 six>=1.9.0
 
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 Babel>=1.3
 
 # for the routing notifier
@@ -24,4 +24,4 @@ suds-jurko>=0.6
 eventlet>=0.17.3
 requests>=2.5.2
 urllib3>=1.8.3
-oslo.concurrency>=2.0.0         # Apache-2.0
+oslo.concurrency>=2.0.0 # 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,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 
 discover
 fixtures>=0.3.14
@@ -12,7 +12,7 @@ mox3>=0.7.0
 python-subunit>=0.0.18
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 
 # when we can require tox>= 1.4, this can go into tox.ini:
 #  [testenv:cover]
@@ -20,7 +20,7 @@ testtools>=0.9.36,!=1.2.0
 coverage>=3.6
 
 # this is required for the docs build jobs
-oslosphinx>=2.5.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslosphinx>=2.5.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 
 bandit>=0.10.1