From 6f87c99fef2d3c98f6a7467dbe2bca88c298efa7 Mon Sep 17 00:00:00 2001
From: OpenStack Jenkins <jenkins@openstack.org>
Date: Tue, 1 Oct 2013 16:12:56 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I2ca8514a7fc2caeb6866ce413b01e212c7b2e28f
---
 setup.py              | 8 +++++---
 test-requirements.txt | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 3e74fe08..70c2b3f3 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 3bb04323..33b3b47b 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