Update requirements.txt

Updates requirements to math global-requirements file.
Also fixes pep8 errors caused by updated requirements.

Change-Id: I4ae0e29db03a4c92e85cf063f049f0d587bc1148
Closes-Bug: #1466123

muranoclient/tests/unit/fakes.py

@@ -14,7 +14,7 @@
 from oslo_serialization import jsonutils
 
 
-class FakeHTTPResponse():
+class FakeHTTPResponse(object):
 
     version = 1.1
 
@@ -43,5 +43,5 @@ class FakeHTTPResponse():
         return jsonutils.loads(self.content)
 
 
-class FakeRaw():
+class FakeRaw(object):
     version = 110

requirements.txt

@@ -1,21 +1,21 @@
 # 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.6,!=0.7,<1.0
+pbr<2.0,>=0.11
 argparse
-PrettyTable>=0.7,<0.8
-python-glanceclient>=0.15.0
-python-keystoneclient>=1.1.0
+PrettyTable<0.8,>=0.7
+python-glanceclient>=0.18.0
+python-keystoneclient>=1.6.0
 httplib2>=0.7.5
 iso8601>=0.1.9
 six>=1.9.0
 Babel>=1.3
 pyOpenSSL>=0.11
-requests>=2.2.0,!=2.4.0
+requests>=2.5.2
 PyYAML>=3.1.0
 
-oslo.serialization>=1.4.0,<1.5.0               # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 
 # not listed in global requirements
 yaql>=0.2.6,<0.3

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,17 +1,17 @@
 # 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.9.2,<0.10
+hacking<0.11,>=0.10
 
 coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
-requests-mock>=0.6.0  # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
 tempest-lib>=0.5.0
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 
 # doc build requirements
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2