Updated from global requirements

Change-Id: Iaa8b23a07e9e39a039528db02b19c05421f25167

requirements.txt

@@ -3,13 +3,13 @@
 # process, which may cause wedges in the gate later.
 
 Babel>=1.3
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
 argparse
 iso8601>=0.1.9
-PrettyTable>=0.7,<0.8
-oslo.i18n>=1.5.0                        # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
+PrettyTable<0.8,>=0.7
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
 python-openstacksdk>=0.4.1
 python-keystoneclient>=1.6.0
 python-heatclient>=0.3.0

setup.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

test-requirements.txt

@@ -3,16 +3,16 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
 fixtures>=0.3.14
-requests-mock>=0.6.0                    # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
 mock>=1.0
 mox3>=0.7.0
-oslosphinx>=2.5.0                       # Apache-2.0
-oslotest>=1.5.1                         # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0