Updated from global requirements

Change-Id: I8f3c3ddf956b9c75cf707abea299427ced517d64

requirements.txt

@@ -2,6 +2,6 @@
 # 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
 six>=1.9.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,10 +3,10 @@
 # process, which may cause wedges in the gate later.
 
 Pillow>=2.4.0 # MIT
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 mock>=1.0
 coverage>=3.6
 testrepository>=0.0.18
 discover
-oslotest>=1.5.1  # Apache-2.0
-oslosphinx>=2.5.0  # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0