Updated from global requirements

Change-Id: I310c1a9c5fe4604652f4f1b281a8acaad4438bc4

requirements.txt

@@ -2,10 +2,10 @@
 # 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
-Jinja2>=2.6                             # BSD License (3 clause)
+pbr<2.0,>=0.11
+Jinja2>=2.6 # BSD License (3 clause)
 Babel>=1.3
-oslo.serialization>=1.4.0               # Apache-2.0
-psutil>=1.1.1,<2.0.0
+oslo.serialization>=1.4.0 # Apache-2.0
+psutil<2.0.0,>=1.1.1
 six>=1.9.0
-oslo.i18n>=1.5.0                        # Apache-2.0
+oslo.i18n>=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

@@ -3,13 +3,13 @@
 # process, which may cause wedges in the gate later.
 
 hacking<0.11,>=0.10.0
-oslotest>=1.5.1
+oslotest>=1.5.1 # Apache-2.0
 
 # These are needed for docs generation
-oslosphinx>=2.5.0
+oslosphinx>=2.5.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 
 # for testing optional parts
-oslo.config>=1.11.0  # Apache-2.0
-eventlet>=0.17.3
+oslo.config>=1.11.0 # Apache-2.0
+eventlet>=0.17.4
 greenlet>=0.3.2