Updated from global requirements

Change-Id: I0385ab1a77293d9175d980a4cfa400adead5a845

requirements.txt

@@ -1,6 +1,9 @@
-pbr
-monasca-statsd
-requests
-PyYAML
-six
-monasca-common
+# 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>=1.6 # Apache-2.0
+monasca-statsd>=1.1.0 # Apache-2.0
+requests>=2.10.0 # Apache-2.0
+PyYAML>=3.1.0 # MIT
+six>=1.9.0 # MIT
+monasca-common>=1.0.0 # Apache-2.0

setup.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +13,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'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)

test-requirements.txt

@@ -1,7 +1,10 @@
-hacking>=0.11.0,<0.12 # Apache-2.0
-pyflakes==0.8.1
-nose
-nosexcover
-mock>=1.0.1
-funcsigs
-sqlalchemy
+# 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.12,>=0.11.0 # Apache-2.0
+pyflakes==0.8.1 # MIT
+nose # LGPL
+nosexcover # BSD
+mock>=2.0 # BSD
+funcsigs>=0.4;python_version=='2.7' or python_version=='2.6' # Apache-2.0
+SQLAlchemy<1.1.0,>=1.0.10 # MIT