From 13506c22a81a8888737f483c66a1de4f15d577d2 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 31 Jan 2018 09:08:21 +0100
Subject: [PATCH] Update requirements manually

The global requirments sync for this repo fails since it lists
packages that are not in the global list. Manually sync
requirements.

Failure log from requirements sync:
http://logs.openstack.org/d8/d89aad257d43fe02e42e44b2a0187dbd9f505c36/post/propose-update-requirements/15a7777/job-output.txt.gz#_2018-01-31_07_10_14_115335

Errors are:
'pywinrm' is not in global-requirements.txt or blacklist.txt

Change-Id: I24dd3c7ea9fa0a907c26ff62773b336c9d2d0b80
---
 requirements.txt      | 10 +++++-----
 setup.py              |  4 ++--
 test-requirements.txt | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 26008a7..c2c902c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,10 +2,10 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=2.0 # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
-oslo.config>=4.0.0,!=4.3.0,!=4.4.0 # Apache-2.0
-oslo.log>=3.22.0 # Apache-2.0
-oslo.utils>=3.20.0 # Apache-2.0
-tempest>=16.1.0 # Apache-2.0
+oslo.config>=5.1.0 # Apache-2.0
+oslo.log>=3.36.0 # Apache-2.0
+oslo.utils>=3.33.0 # Apache-2.0
+tempest>=17.1.0 # Apache-2.0
 pywinrm>=0.2.2 # MIT
diff --git a/setup.py b/setup.py
index 4a81992..566d844 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cloudbase Solutions SRL
+# 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.
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=2.0'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 0bc4085..b64cb5f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,14 +2,14 @@
 # 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,<0.13 # Apache-2.0
+hacking<0.13,>=0.12.0 # Apache-2.0
 
-coverage>=4.0 # Apache-2.0
-python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.5.1 # BSD
+coverage!=4.4,>=4.0 # Apache-2.0
+python-subunit>=1.0.0 # Apache-2.0/BSD
+sphinx!=1.6.6,>=1.6.2 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18  # Apache-2.0/BSD
-testscenarios>=0.4  # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
+oslotest>=3.2.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=2.2.0 # MIT