From bb337d58be3b42b43de30343dba7d23f3e7c3dfc Mon Sep 17 00:00:00 2001 From: Ruslan Kamaldinov Date: Sun, 14 Dec 2014 04:47:18 +0300 Subject: [PATCH] Updated from global requirements This is an important update and should be merged ASAP. Latest release of setuptools 8.0 introduced new rules which make current constraints on SQLAlchemy invalid. As a temporary workaround all the jenkins slave nodes have a cap on setuptools version, but it is going to be removed soon. Change-Id: I4b9e02cc0c094b7287a82d0718db0b6529373e9f --- requirements.txt | 5 +++-- setup.py | 8 ++++++++ test-requirements.txt | 9 ++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4a1fcd894..b2bfe03ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. pbr>=0.6,!=0.7,<1.0 Babel>=1.3 -SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99 +SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6 alembic>=0.6.4 anyjson>=0.3.3 eventlet>=0.15.1 @@ -34,8 +34,9 @@ python-heatclient>=0.2.9 python-neutronclient>=2.3.6,<3 oslo.db>=1.0.0 # Apache-2.0 oslo.config>=1.4.0 # Apache-2.0 -oslo.messaging>=1.4.0 +oslo.messaging>=1.4.0,!=1.5.0 # not listed in global requirements yaql>=0.2.3,<0.3 python-muranoclient>=0.5.5 + diff --git a/setup.py b/setup.py index 70c2b3f32..736375744 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.txt b/test-requirements.txt index afcf8172e..0bec0b3a1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,6 @@ +# 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.8.0,<0.9 coverage>=3.6 @@ -5,11 +8,11 @@ discover fixtures>=0.3.14 mock>=1.0 posix_ipc -sqlalchemy-migrate>=0.8.2,!=0.8.4 +sqlalchemy-migrate>=0.9.1,!=0.9.2 testrepository>=0.0.18 testresources>=0.2.4 testscenarios>=0.4 -testtools>=0.9.34 +testtools>=0.9.34,!=1.4.0 unittest2 # Some of the tests use real MySQL and Postgres databases @@ -17,4 +20,4 @@ MySQL-python psycopg2 # doc build requirements -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,<1.3