From 02d600e331d50275337ceaa006947f9b911da533 Mon Sep 17 00:00:00 2001
From: Adam Reznechek <adreznec@us.ibm.com>
Date: Fri, 31 Mar 2017 09:23:05 -0500
Subject: [PATCH] Manual sync with upstream requirements

Bump the reqs/test-reqs to the latest from the upstream
global requirements project.

Change-Id: Ic2f532833d04cb76f5f171d08b7855dc5cc3b218
---
 requirements.txt | 6 +++---
 setup.py         | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1f7db7b..73269fc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # 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.
-oslo.log>=3.11.0 # Apache-2.0
+oslo.log>=3.22.0 # Apache-2.0
 pbr>=2.0.0 # Apache-2.0
-pypowervm
-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,>=16.0 # PSF/ZPL
+pypowervm>=1.1.1 # Apache-2.0
+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 81a9287..566d844 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)