From b8aeb537457d082320a4227294ccd0103ac3046c Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Fri, 3 Jul 2015 15:27:20 -0700
Subject: [PATCH] Update requirements.txt with global-requirements.txt

Syncs requirements with current liberty g-r using requirements/update.py

Note gunicorn is not in g-r and is appended to the list manually

Change-Id: Iaab5c9beeeb2f9055c53b94860d123be411faa8e
---
 requirements.txt      | 18 +++++++++++-------
 setup.py              | 30 +++++++++++++++++++-----------
 test-requirements.txt |  7 +++++--
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index feb07fa..d33a851 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,11 @@
-flask>=0.9
-dogpile.cache>=0.5.4
-gunicorn>=0.14.6,<19
-netaddr>=0.7.7
-eventlet>=0.9.17
-requests>=0.14.1,<=1.2.0
-greenlet>=0.4.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.
+Flask<1.0,>=0.10
+dogpile.cache>=0.5.3
+netaddr>=0.7.12
+eventlet>=0.17.4
+requests>=2.5.2
+greenlet>=0.3.2
+
+gunicorn>=0.14.6,<1  # Not in global-requirements.txt
diff --git a/setup.py b/setup.py
index 650f464..056c16c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,21 +1,29 @@
-# Copyright 2014 DreamHost, LLC
-# Copyright 2015 Akanda, Inc
+# 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. You may obtain
-# a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # 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. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
 
+# 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
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
+
 setuptools.setup(
     setup_requires=['pbr'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 611dffe..21b324c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +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.
 unittest2
 nose
-coverage
-mock>=0.8.0
+coverage>=3.6
+mock>=1.0