Merge "Update from global requirements" into stable/junojuno-eol2.3.2stable/juno

4 files changed, 37 insertions, 14 deletions

diff --git a/requirements.txt b/requirements.txt
index e7c0d41..19377ff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,7 @@
-futures>=2.1.3
-requests>=1.1
-simplejson>=2.0.9
-six>=1.5.2
+# 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.
+futures<=2.2.0,>=2.1.6
+requests!=2.4.0,<=2.2.1,>=2.1.0
+simplejson<=3.3.1,>=2.2.0
+six<=1.9.0,>=1.7.0
diff --git a/setup.py b/setup.py
index 70c2b3f..056c16c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,14 @@
 # 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 5427920..efbbee3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,10 +1,13 @@
-hacking>=0.8.0,<0.9
+# 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.9,>=0.8.0
 
-coverage>=3.6
-discover
-mock>=1.0
-oslosphinx
-python-keystoneclient>=0.7.0
-sphinx>=1.1.2,<1.2
-testrepository>=0.0.18
-testtools>=0.9.34
+coverage<=3.7.1,>=3.6
+discover<=0.4.0
+mock<=1.0.1,>=1.0
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
+python-keystoneclient<1.2.0,>=0.10.0
+sphinx!=1.2.0,<1.3,>=1.1.2
+testrepository<=0.0.20,>=0.0.18
+testtools!=1.4.0,<=1.5.0,>=0.9.34
diff --git a/tox.ini b/tox.ini
index efe62af..94a9820 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,16 @@ commands = python setup.py testr --coverage
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
+[testenv:func]
+setenv = OS_TEST_PATH=tests.functional
+whitelist_externals =
+    coverage
+    rm
+commands =
+    python setup.py testr --coverage --testr-args="--concurrency=1"
+    coverage report -m
+    rm -f .coverage
+
 [testenv:docs]
 commands=
     python setup.py build_sphinx