From 78ec39a711386488fdc1223ec29b4edd521dc287 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 18 Sep 2013 08:19:24 -0500
Subject: [PATCH] Update from requirements

The specifically desired change is the one to setup.py which removes the
reference to d2to1. d2to1 is very undesirable to consume due to its
explicit dependency on distribute that is still unfixed. While we're
doing it, go ahead and do the full update.py from requirements.txt to
reduce later churn.

Change-Id: Ia862337b904ba021db8fc21cb21b886f948bd3fc
---
 setup.cfg             | 4 ----
 setup.py              | 8 +++++---
 test-requirements.txt | 8 ++++----
 tox.ini               | 2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index f944b6b82..0c5e4cbb9 100644
--- a/setup.cfg
+++ b/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
diff --git a/setup.py b/setup.py
index 3e74fe081..70c2b3f32 100755
--- a/setup.py
+++ b/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)
diff --git a/test-requirements.txt b/test-requirements.txt
index 3bb043237..33b3b47b6 100644
--- a/test-requirements.txt
+++ b/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
diff --git a/tox.ini b/tox.ini
index 9f1bf3706..f5dbbf1c0 100644
--- a/tox.ini
+++ b/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