diff --git a/requirements.txt b/requirements.txt index ebb1c0c..4068b2b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,8 +7,8 @@ # be installed in a specific order. # # PBR should always appear first -pbr>=1.6 -python-zaqarclient>=0.3.0 -Babel>=1.3 -Django<1.9,>=1.8 -django-babel>=0.4.0 +pbr>=1.6 # Apache-2.0 +python-zaqarclient>=1.0.0 # Apache-2.0 +Babel>=2.3.4 # BSD +Django<1.9,>=1.8 # BSD +django-babel>=0.5.1 # BSD diff --git a/setup.py b/setup.py index 4a1874a..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +# 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. @@ -13,8 +13,12 @@ # 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: diff --git a/test-requirements.txt b/test-requirements.txt index 1948ed7..207b058 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,20 +9,20 @@ # Hacking should appear first in case something else depends on pep8 hacking<0.11,>=0.10.2 # -coverage>=3.6 -django-nose>=1.2 -mock>=1.2 -mox3>=0.7.0 -nodeenv>=0.9.4 # BSD License -nose -nose-exclude -nosehtmloutput>=0.0.3 -nosexcover -openstack.nose-plugin>=0.7 -oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0 -selenium -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -testtools>=1.4.0 +coverage>=3.6 # Apache-2.0 +django-nose>=1.4.4 # BSD +mock>=2.0 # BSD +mox3>=0.7.0 # Apache-2.0 +nodeenv>=0.9.4 # BSD License # BSD +nose # LGPL +nose-exclude # LGPL +nosehtmloutput>=0.0.3 # Apache-2.0 +nosexcover # BSD +openstack.nose-plugin>=0.7 # Apache-2.0 +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 +selenium>=2.50.1 # Apache-2.0 +sphinx!=1.3b1,<1.3,>=1.2.1 # BSD +testtools>=1.4.0 # MIT # This also needs xvfb library installed on your OS xvfbwrapper>=0.1.3 #license: MIT # Include horizon as test requirement