Updated from global requirements

Change-Id: I944acbdbb6ba74e8f68eb110c40a1169f85dc363

requirements.txt

@@ -2,12 +2,12 @@
 # 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
 argparse
 Babel>=1.3
 iso8601>=0.1.9
 lxml>=2.3
-oslo.config>=1.11.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslo.config>=1.11.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 demjson # GNU LGPL 3.0
 PyYAML>=3.1.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.
 
 bashate>=0.2 # Apache-2.0
-doc8  # Apache-2.0
+doc8 # Apache-2.0
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.10.0,<0.11
-pylint==1.4.1  # GNU GPL v2
+hacking<0.11,>=0.10.0
+pylint==1.4.1 # GNU GPL v2