Merge "Sync from global-requirements"

Author: Jenkins

requirements.txt

@@ -1,2 +1,5 @@
-python-monascaclient
-Django<1.9,>=1.8
+# 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.
+python-monascaclient>=1.1.0 # Apache-2.0
+Django<1.9,>=1.8 # BSD

setup.py

@@ -1,5 +1,29 @@
-from setuptools import setup
+# 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.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-setup(
-    setup_requires=['pbr'],
+# 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>=1.8'],
     pbr=True)

test-requirements.txt

@@ -1,19 +1,22 @@
+# 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
+hacking>=0.12.0,<0.13  # Apache-2.0
 
-coverage>=3.6
-django-nose
-mock>=1.0
-funcsigs
-mox3>=0.7.0
-nodeenv
-nose
-nose-exclude
-nosexcover
-openstack.nose_plugin>=0.7
-nosehtmloutput>=0.0.3
-selenium
+coverage>=4.0 # Apache-2.0
+django-nose>=1.4.4 # BSD
+mock>=2.0 # BSD
+funcsigs>=0.4;python_version=='2.7' or python_version=='2.6' # Apache-2.0
+mox3>=0.7.0 # Apache-2.0
+nodeenv>=0.9.4 # BSD
+nose # LGPL
+nose-exclude # LGPL
+nosexcover # BSD
+openstack.nose-plugin>=0.7 # Apache-2.0
+nosehtmloutput>=0.0.3 # Apache-2.0
+selenium>=2.50.1 # Apache-2.0
 # Docs Requirements
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+oslosphinx>=4.7.0 # Apache-2.0
 http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon