Updated from global requirements

Change-Id: Ie0971880eae2abf3388a88eae4086698e9024c8d

requirements.txt

@@ -1,10 +1,10 @@
 # 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
+pbr<2.0,>=0.11
 argparse
 cmd2>=0.6.7
-PrettyTable>=0.7,<0.8
+PrettyTable<0.8,>=0.7
 pyparsing>=2.0.1
 six>=1.9.0
-stevedore>=1.5.0  # Apache-2.0
+stevedore>=1.5.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

@@ -5,6 +5,6 @@ nose
 mock>=1.0
 coverage>=3.6
 # this is required for the docs build jobs
-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
+oslosphinx>=2.5.0 # Apache-2.0
 httplib2>=0.7.5