Updated from global requirements

Change-Id: I1a487f51430ac918d21172a6e73b28534841ffc3

requirements.txt

@@ -3,12 +3,12 @@
 # process, which may cause wedges in the gate later.
 
 Babel>=1.3
-oslo.config>=1.11.0  # Apache-2.0
-oslo.context>=0.2.0                     # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.4.0                       # Apache-2.0
-pbr>=0.11,<2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.context>=0.2.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+pbr<2.0,>=0.11
 pycadf>=0.8.0
 python-keystoneclient>=1.6.0
 requests>=2.5.2

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-py3.txt

@@ -2,19 +2,19 @@
 # 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
 fixtures>=0.3.14
 mock>=1.0
 pycrypto>=2.6
-oslosphinx>=2.5.0  # Apache-2.0
-oslotest>=1.5.1  # Apache-2.0
-oslo.messaging>=1.8.0  # Apache-2.0
-requests-mock>=0.6.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-stevedore>=1.5.0  # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
+oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+stevedore>=1.5.0 # Apache-2.0
 testrepository>=0.0.18
 testresources>=0.2.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0

test-requirements.txt

@@ -2,21 +2,21 @@
 # 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
 fixtures>=0.3.14
 mock>=1.0
 pycrypto>=2.6
-oslosphinx>=2.5.0  # Apache-2.0
-oslotest>=1.5.1  # Apache-2.0
-oslo.messaging>=1.8.0  # Apache-2.0
-requests-mock>=0.6.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-stevedore>=1.5.0  # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
+oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+stevedore>=1.5.0 # Apache-2.0
 testrepository>=0.0.18
 testresources>=0.2.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 python-memcached>=1.48
 
 # Bandit security code scanner