Merge "Update from requirements"

setup.cfg

@@ -32,10 +32,6 @@ data_files =
     share/diskimage-builder/lib = lib/*
     share/diskimage-builder/scripts = scripts/*
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg

setup.py

@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/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.
@@ -13,8 +14,9 @@
 # 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=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr'],
+    pbr=True)

test-requirements.txt

@@ -1,8 +1,8 @@
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.8
 
 coverage>=3.6
 discover
-testrepository>=0.0.13
-testtools>=0.9.27
-Babel>=0.9.6,<1.0
+testrepository>=0.0.17
+testtools>=0.9.32
+Babel>=0.9.6
 argparse

tox.ini

@@ -26,6 +26,6 @@ commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
 downloadcache = ~/cache/pip
 
 [flake8]
-ignore = E125,H803
+ignore = E125,H202,H803
 builtins = _
 exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build