Sync with global requirements

Change-Id: I8333e17d8edaa5853ac47f9d53de8c44d1c5d5cb

requirements.txt

@@ -1,8 +1,7 @@
-d2to1>=0.2.10,<0.3
+pbr>=0.5.16,<0.6
-pbr>=0.5,<0.6
 argparse
 iso8601>=0.1.4
-prettytable>=0.6,<0.8
+PrettyTable>=0.6,<0.8
-requests>=0.8
+requests>=1.1,<1.2.3
-simplejson
+simplejson>=2.0.9
 six

setup.py

@@ -1,4 +1,5 @@
-# Copyright 2011 OpenStack Foundation
+#!/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.
@@ -8,17 +9,14 @@
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-
 setuptools.setup(
-    setup_requires=[
+    setup_requires=['pbr>=0.5.20'],
-        'd2to1>=0.2.10,<0.3',
+    pbr=True)
-        'pbr>=0.5,<0.6'
-    ],
-    d2to1=True
-)

test-requirements.txt

@@ -2,13 +2,13 @@
 pep8==1.4.5
 pyflakes==0.7.2
 flake8==2.0
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.7
 
-coverage
+coverage>=3.6
 discover
 fixtures>=0.3.12
 keyring
-mock
+mock>=0.8.0
 sphinx>=1.1.2
-testrepository>=0.0.13
+testrepository>=0.0.17
-testtools>=0.9.26
+testtools>=0.9.32

tox.ini

@@ -24,6 +24,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 downloadcache = ~/cache/pip
 
 [flake8]
-ignore = E12,E711,E721,E712,F841,F811,F821,H302,H306,H403,H404
+ignore = E12,E711,E721,E712,F841,F811,F821,H102,H302,H306,H403,H404,H501
 show-source = True
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build