Updated from global requirements

Change-Id: Ia9f19d0352a801325e0ed82543e38f95c891e5df

requirements.txt

@@ -1,10 +1,13 @@
-pbr>=0.5.21,<1.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.
+pbr>=0.6,!=0.7,<1.0
 
 argparse
 Babel>=1.3
-iso8601>=0.1.8
+iso8601>=0.1.9
-prettytable>=0.6,<0.8
+PrettyTable>=0.7,<0.8
-python-keystoneclient>=0.4.1
+python-keystoneclient>=0.10.0
-requests>=1.1
+requests>=1.2.1,!=2.4.0
-simplejson>=2.0.9
+simplejson>=2.2.0
-six>=1.4.1
+six>=1.7.0

setup.py

@@ -14,8 +14,17 @@
 # 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)

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.
 # Hacking already pins down pep8, pyflakes and flake8
 hacking>=0.9.2,<0.10
 
@@ -5,7 +8,7 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 mock>=1.0
-sphinx>=1.1.2,<1.2
+sphinx>=1.1.2,!=1.2.0,<1.3
-sphinxcontrib-pecanwsme>=0.5
+sphinxcontrib-pecanwsme>=0.8
-testrepository>=0.0.17
+testrepository>=0.0.18
-testtools>=0.9.32
+testtools>=0.9.34