Updated from global requirements

Change-Id: Iea5033e9232b405c7fa371943404cbf2614880c2

requirements.txt

@@ -1,24 +1,24 @@
 # 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
 Babel>=1.3
-eventlet>=0.17.3
+eventlet>=0.17.4
 iso8601>=0.1.9
 netifaces>=0.10.4
 ordereddict
-oslo.config>=1.11.0  # Apache-2.0
-oslo.concurrency>=2.0.0         # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.log>=1.2.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.concurrency>=2.1.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
 oslo.service>=0.1.0 # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 pecan>=0.8.0
-psutil>=1.1.1,<2.0.0
+psutil<2.0.0,>=1.1.1
 pyudev
 requests>=2.5.2
 six>=1.9.0
-stevedore>=1.5.0  # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
 WSME>=0.7
-oslotest>=1.5.1  # Apache-2.0
+oslotest>=1.5.1 # 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

@@ -1,15 +1,15 @@
 # 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.
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
 mock>=1.0
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 python-subunit>=0.0.18
 
 # Doc requirements
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 sphinxcontrib-pecanwsme>=0.8
-oslosphinx>=2.5.0  # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0