From c6f4b41b5741d31a3a7a6f6c9d9c9f2a6070fb5d Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Fri, 3 Mar 2017 08:00:31 +1100
Subject: [PATCH] Manual sync with openstack/requirements repo

This is in preperation for setting up the repo to auto sync via the
proposal-bot.

Change-Id: I0b4818f3eb0b9bace9ee61e7f855fd070aee684b
Depends-On: Ife1ee6f04f60a8de03f14713ec1dcf82edf140ce
---
 requirements.txt      | 12 ++++++------
 setup.py              |  5 ++---
 test-requirements.txt |  6 ++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 294bf432..494a31e6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,14 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-amqp<2.0,>=1.4.0 # LGPL
-pbr>=1.8 # Apache-2.0
+amqp!=2.1.4,>=2.1.0 # BSD
+pbr>=2.0.0 # Apache-2.0
 Babel>=2.3.4 # BSD
 six>=1.9.0 # MIT
-oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
+oslo.config>=3.22.0 # Apache-2.0
 oslo.log>=3.11.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=3.18.0 # Apache-2.0
-pypowervm
+oslo.utils>=3.20.0 # Apache-2.0
+pypowervm>=1.1.0 # Apache-2.0
 taskflow>=2.7.0 # Apache-2.0
-setuptools!=24.0.0,>=16.0 # PSF/ZPL
+setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,>=16.0 # PSF/ZPL
diff --git a/setup.py b/setup.py
index 81a92874..566d8443 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-# Copyright 2014 IBM Corp.
+# 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.
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.8'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 033ee344..08d623be 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,16 +1,14 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking<0.12,>=0.11.0 # Apache-2.0
-
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 bashate>=0.2 # Apache-2.0
 coverage>=4.0 # Apache-2.0
-discover # BSD
 fixtures>=3.0.0 # Apache-2.0/BSD
 pycrypto>=2.6 # Public Domain
 python-subunit>=0.0.18 # Apache-2.0/BSD
 python-swiftclient>=3.2.0 # Apache-2.0
-sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+sphinx>=1.5.1 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 os-testr>=0.8.0 # Apache-2.0