Sync up with global-requirements

Change Ib41b0c482edf39017f26e483cd3661ca5b540133 adds glance_store to
projects.txt in the requirements repo so glance_store will start getting
automatic requirement updates when global-requirements is updated.

This is the preliminary sync for the stable/kilo branch.

Closes-Bug: #1454695

Change-Id: I687ca6ee820aad2d9a19801248ae86e7198ee556

3 files changed, 31 insertions, 17 deletions

diff --git a/requirements.txt b/requirements.txt
index 8ff82a6..0546574 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,18 @@
-oslo.config>=1.6.0 # Apache-2.0
-oslo.i18n>=0.1.0
-oslo.serialization>=1.0.0 # Apache-2.0
-oslo.utils>=1.2.0 # Apache-2.0
-oslo.concurrency>=1.4.1         # Apache-2.0
-stevedore>=0.12
+# 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.config>=1.9.3,<1.10.0  # Apache-2.0
+oslo.i18n>=1.5.0,<1.6.0  # Apache-2.0
+oslo.serialization>=1.4.0,<1.5.0               # Apache-2.0
+oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
+oslo.concurrency>=1.8.0,<1.9.0         # Apache-2.0
+stevedore>=1.3.0,<1.4.0  # Apache-2.0
 enum34
 
-python-cinderclient>=1.0.6
+python-cinderclient>=1.1.0,<1.2.0
 
-eventlet>=0.13.0 #s3
-six>=1.4.1
+eventlet>=0.16.1,!=0.17.0
+six>=1.9.0
 
 jsonschema>=2.0.0,<3.0.0
 
diff --git a/setup.py b/setup.py
index 70c2b3f..7363757 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,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 2daee15..cf12394 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,6 @@
+# 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.
 # Metrics and style
 hacking>=0.10.0,<0.11
 
@@ -8,26 +11,26 @@ mock>=1.0
 coverage>=3.6
 fixtures>=0.3.14
 python-subunit>=0.0.18
-requests-mock>=0.5.1 # Apache-2.0
+requests-mock>=0.6.0  # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.34
-oslotest
+testtools>=0.9.36,!=1.2.0
+oslotest>=1.5.1,<1.6.0  # Apache-2.0
 
 # this is required for the docs build jobs
-sphinx>=1.1.2,!=1.2.0,<1.3
-oslosphinx
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
 
 #
 # Store specific packages
 #
 
 # For S3 storage backend
-boto>=2.12.0,!=2.13.0
+boto>=2.32.1
 
 # For VMware storage backend.
-oslo.vmware>=0.4                        # Apache-2.0
+oslo.vmware>=0.11.1,<0.12.0                     # Apache-2.0
 
 # Swift Backend
 httplib2>=0.7.5
-python-swiftclient>=2.0.2
+python-swiftclient>=2.2.0,<2.5.0