From bc326285184b009664a24d6d731918476b0660f8 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 30 Aug 2014 08:57:59 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I227e5611243ddcdcc779736c657fd7d6ac04dad7 --- requirements.txt | 2 +- setup.py | 8 ++++++++ test-requirements-py3.txt | 6 +++--- test-requirements.txt | 8 ++++---- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 58b77b6..26edfcc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -six>=1.4.1 +six>=1.7.0 diff --git a/setup.py b/setup.py index 70c2b3f..7363757 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,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'], pbr=True) diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt index 82ecdd0..a943dc3 100644 --- a/test-requirements-py3.txt +++ b/test-requirements-py3.txt @@ -2,10 +2,10 @@ hacking>=0.9.2,<0.10 discover fixtures>=0.3.14 -python-subunit -testrepository>=0.0.17 +python-subunit>=0.0.18 +testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.32 +testtools>=0.9.34 # when we can require tox>= 1.4, this can go into tox.ini: # [testenv:cover] diff --git a/test-requirements.txt b/test-requirements.txt index 4b37623..e773fed 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,13 +2,13 @@ hacking>=0.9.2,<0.10 discover fixtures>=0.3.14 -python-subunit -testrepository>=0.0.17 +python-subunit>=0.0.18 +testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.32 +testtools>=0.9.34 # mocking framework mock>=1.0 # rootwrap daemon's client should be verified to run in eventlet -eventlet>=0.13.0 +eventlet>=0.15.1