From d4db1e22102281c08e3ea42f52e75894ac04d263 Mon Sep 17 00:00:00 2001 From: jfwood Date: Fri, 3 Oct 2014 14:58:33 -0500 Subject: [PATCH] Update to the latest global requirements versions Executed the update.py script against Barbican per this repository: https://github.com/openstack/requirements The resultant modified files are added per this CR. Change-Id: I0b151573ca3e345b0e09eed358550fff9571e204 --- requirements.txt | 29 ++++++++++++++++------------- setup.py | 8 ++++++++ test-requirements.txt | 9 ++++++--- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4f62057f8..fdd040c7e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,29 +1,32 @@ -alembic>=0.4.1 +# 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. +alembic>=0.6.4 argparse Babel>=1.3 -cryptography>=0.4 -eventlet>=0.13.0 +cryptography>=0.4 # Apache-2.0 +eventlet>=0.15.1 iso8601>=0.1.9 -jsonschema>=1.3.0,!=1.4.0 -kombu>=2.4.8 -netaddr>=0.7.6 -oslo.config>=1.2.0 -oslo.messaging>=1.3.0a4 +jsonschema>=2.0.0,<3.0.0 +kombu>=2.5.0 +netaddr>=0.7.12 +oslo.config>=1.4.0 # Apache-2.0 +oslo.messaging>=1.4.0 Paste PasteDeploy>=1.5.0 pbr>=0.6,!=0.7,<1.0 -# TODO(john-wood-w) Temporary pin of Pecan, pending bug: +# TODO(john-wood-w) Temporary pin of Pecan to < 0.7.0, pending bug fix release: # https://bugs.launchpad.net/pecan/+bug/1373003 -pecan==0.6.0 +pecan>=0.5.0,<0.7.0 pycrypto>=2.6 pysqlite keystonemiddleware>=1.0.0 six>=1.7.0 -SQLAlchemy>=0.7.8,<=0.9.99 -stevedore>=0.12 -WebOb>=1.2.3,<1.3 +SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99 +stevedore>=1.0.0 # Apache-2.0 +WebOb>=1.2.3 wsgiref>=0.1.2 # TODO: Get this working again...PyKCS11>=1.2.4 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 6333fa313..ad0da7434 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,13 +1,16 @@ +# 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. coverage>=3.6 discover hacking>=0.8.0,<0.9 mock>=1.0 -oslotest>=1.1.0.0a1 +oslotest>=1.1.0 # Apache-2.0 testrepository>=0.0.18 testtools>=0.9.34 fixtures>=0.3.14 requests>=1.2.1,!=2.4.0 # Documentation build requirements -sphinx>=1.1.2,<1.2 -oslosphinx +sphinx>=1.1.2,!=1.2.0,<1.3 +oslosphinx>=2.2.0 # Apache-2.0