Updated from global requirements

This is a manual sync of our requirements from g-r.  I believe the
bot is not proposing updates because we had an entry in
requirements.txt that was not in g-r, so the update script was
failing.  Once this merges we should get automated updates again.

Change-Id: I7daf819ccc965d10b80929ae80f6606ed3511661

doc/source/conf.py

@@ -12,7 +12,6 @@
 # serve to show the default.
 
 import sys, os
-import sphinx_rtd_theme
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

requirements.txt

@@ -1,10 +1,13 @@
-six>=1.9.0
-python-keystoneclient>=2.0.0,!=2.1.0  # Apache-2.0
-python-novaclient
+# 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.
+six>=1.9.0 # MIT
+python-keystoneclient>=3.8.0 # Apache-2.0
+python-novaclient>=7.1.0 # Apache-2.0
 python-mistralclient>=2.0.0 # Apache-2.0
-oslo.config
-psutil>=1.1.1,<2.0.0
-netaddr>=0.7.12,!=0.7.16
-pystache
-os-refresh-config
-os-apply-config
+oslo.config>=3.22.0 # Apache-2.0
+psutil>=3.2.2 # BSD
+netaddr!=0.7.16,>=0.7.13 # BSD
+pystache # MIT
+os-refresh-config # Apache-2.0
+os-apply-config # Apache-2.0

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'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)

test-requirements.txt

@@ -1,17 +1,19 @@
+# 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.
 # Doc requirements
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.2.0  # Apache-2.0
-sphinx_rtd_theme==0.1.7
+sphinx>=1.5.1 # BSD
+oslosphinx>=4.7.0 # Apache-2.0
 
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 
-coverage>=3.6
-fixtures>=0.3.14
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
-mock>=1.0
-oslotest>=1.5.1  # Apache-2.0
-bashate
-reno>=1.8.0  # Apache-2.0
+coverage>=4.0 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+mock>=2.0 # BSD
+oslotest>=1.10.0 # Apache-2.0
+bashate>=0.2 # Apache-2.0
+reno>=1.8.0 # Apache-2.0