From 1d0ecea034315a1e90a9051b9b855f19d692d4dd Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 4 Jul 2016 11:35:44 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I640aee8c9bb3610ad1c8368e9cbe0427b0f28153
---
 requirements.txt      | 21 ++++++++++++---------
 setup.py              | 18 +++++++++---------
 test-requirements.txt | 19 +++++++++++--------
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index cf1b4af6..d4e6d295 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,15 @@
-elasticsearch>=1.3.0,<2.0 # Apache-2.0
+# 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.
+elasticsearch<2.0,>=1.3.0 # Apache-2.0
 falcon>=0.1.6 # Apache-2.0
-jsonschema>=2.0.0,<3.0.0,!=2.5.0 # MIT
-keystonemiddleware>=4.0.0 # Apache-2.0
-Paste  # MIT
-PasteDeploy>=1.5.0  # MIT
-oslo.config>=3.2.0 # Apache-2.0
-oslo.context>=2.2.0                     # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
-oslo.log>=1.14.0  # Apache-2.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
+keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0
+Paste # MIT
+PasteDeploy>=1.5.0 # MIT
+oslo.config>=3.10.0 # Apache-2.0
+oslo.context>=2.4.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.log>=1.14.0 # Apache-2.0
 oslo.middleware>=3.0.0 # Apache-2.0
 six>=1.9.0 # MIT
diff --git a/setup.py b/setup.py
index 2e3c629b..782bb21f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-
-# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P.
+# 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.
@@ -10,11 +8,14 @@
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from setuptools import setup
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
+
 # In python < 2.7.4, a lazy loading of package `pbr` will break
 # setuptools if some other modules registered functions in `atexit`.
 # solution from: http://bugs.python.org/issue15881#msg170215
@@ -23,7 +24,6 @@ try:
 except ImportError:
     pass
 
-setup(
-    setup_requires=['pbr'],
-    pbr=True,
-)
+setuptools.setup(
+    setup_requires=['pbr>=1.8'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 777fcf5f..2e5f5fd1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,15 +1,18 @@
-astroid<1.4.0 # breaks pylint 1.4.4
-flake8>2.4.1,<2.6.0 # MIT
-pylint==1.4.5 # GNU GPL v2
-hacking>=0.10.2,<0.11 # Apache-2.0
+# 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.
+astroid<1.4.0 # LGPLv2.1 # breaks pylint 1.4.4
+flake8<2.6.0,>=2.5.4 # MIT
+pylint==1.4.5 # GPLv2
+hacking<0.11,>=0.10.2 # Apache-2.0
 coverage>=3.6 # Apache-2.0
 discover # BSD
-mock>=1.2 # BSD
-oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0
+mock>=2.0 # BSD
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 # BSD
+sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 
 # Tempest Plugin
-tempest-lib>=0.14.0  # Apache-2.0
+tempest-lib>=0.14.0 # Apache-2.0