diff --git a/requirements.txt b/requirements.txt index e01e500b..a4b8cb2b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,23 +1,26 @@ +# 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. pbr>=0.6,!=0.7,<1.0 -eventlet>=0.13.0 -keystonemiddleware -python-ceilometerclient -python-keystoneclient -iso8601 -PasteDeploy==1.5.2 +eventlet>=0.16.1,!=0.17.0 +keystonemiddleware>=1.5.0,<1.6.0 +python-ceilometerclient>=1.0.13,<1.1.0 +python-keystoneclient>=1.1.0,<1.4.0 +iso8601>=0.1.9 +PasteDeploy>=1.5.0 posix_ipc pecan>=0.8.0 -WSME>=0.7 -oslo.config>=1.2.0 -oslo.context -oslo.concurrency -oslo.db -oslo.i18n -oslo.log -oslo.messaging -oslo.middleware -oslo.policy -oslo.utils -sqlalchemy -six>=1.7.0 -stevedore +WSME>=0.6 +oslo.config>=1.9.3,<1.10.0 # Apache-2.0 +oslo.context>=0.2.0,<0.3.0 # Apache-2.0 +oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 +oslo.db>=1.7.0,<1.8.0 # Apache-2.0 +oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 +oslo.log>=1.0.0,<1.1.0 # Apache-2.0 +oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 +oslo.middleware>=1.0.0,<1.1.0 # Apache-2.0 +oslo.policy>=0.3.1,<0.4.0 # Apache-2.0 +oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 +SQLAlchemy>=0.9.7,<=0.9.99 +six>=1.9.0 +stevedore>=1.3.0,<1.4.0 # Apache-2.0 diff --git a/setup.py b/setup.py index b0bea1e2..73637574 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,30 @@ +#!/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. +# 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. + +# 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 4b3bf3c6..769c6502 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,11 +1,14 @@ +# 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.9.2,<0.10 coverage>=3.6 discover -testscenarios -testrepository +testscenarios>=0.4 +testrepository>=0.0.18 mock>=1.0 -sphinx>=1.1.2,!=1.2.0,<1.3 -oslosphinx -oslotest +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 +oslotest>=1.5.1,<1.6.0 # Apache-2.0 sphinxcontrib-httpdomain sphinxcontrib-pecanwsme>=0.8