Updated from global requirements

Change-Id: I2476f413fd182a8203604c099d074d06eb1a5656

requirements.txt

@@ -1,12 +1,15 @@
-netaddr>=0.7.12         # playbooks/inventory/dynamic_inventory.py
+# The order of packages is significant, because pip processes them in the order
-PrettyTable>=0.7,<0.8   # scripts/inventory-manage.py
+# of appearance. Changing the order has an impact on the overall integration
-pycrypto>=2.6           # scripts/pw-token-gen.py
+# process, which may cause wedges in the gate later.
-PyYAML>=3.1.0           # scripts/pw-token-gen.py
+netaddr!=0.7.16,>=0.7.12 # BSD
-virtualenv>=14.0.0      # Used for Ansible isolation
+PrettyTable<0.8,>=0.7 # BSD
+pycrypto>=2.6 # Public Domain
+PyYAML>=3.1.0 # MIT
+virtualenv # MIT
 ###
 ### These are pinned to ensure exactly the same behaviour forever!   ###
 ### These pins are updated through the sources-branch-updater script ###
 ###
-pip==8.1.2
+pip>=6.0 # MIT
-setuptools==22.0.0
+setuptools!=24.0.0,>=16.0 # PSF/ZPL
-wheel==0.29.0
+wheel # MIT

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>=1.8'],
     pbr=True)

test-requirements.txt

@@ -1,16 +1,19 @@
-bashate==0.5.0 # Apache-2.0
+# The order of packages is significant, because pip processes them in the order
-coverage<=4.0.3 # Apache-2.0
+# of appearance. Changing the order has an impact on the overall integration
-flake8==2.2.4
+# process, which may cause wedges in the gate later.
-hacking>=0.10.0,<0.11
+bashate>=0.2 # Apache-2.0
-mccabe==0.2.1 # capped for flake8
+coverage>=3.6 # Apache-2.0
-mock==2.0.0
+flake8<2.6.0,>=2.5.4 # MIT
-pep8==1.5.7
+hacking<0.11,>=0.10.0
-pyflakes==0.8.1
+mccabe==0.2.1 # MIT License
-virtualenv>=14.0.0
+mock>=2.0 # BSD
+pep8==1.5.7 # MIT
+pyflakes==0.8.1 # MIT
+virtualenv # MIT
 
 # this is required for the docs build jobs
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
-oslosphinx>=2.5.0 # Apache-2.0
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
-openstackdocstheme>=1.2.3
+openstackdocstheme>=1.0.3 # Apache-2.0
 doc8 # Apache-2.0
-reno>=0.1.1 # Apache-2.0
+reno>=1.8.0 # Apache2