diff --git a/requirements.txt b/requirements.txt index 704c1c3..889afee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,16 @@ -Babel>=1.3 -eventlet>=0.13.0 -iso8601>=0.1.9 -jsonschema>=2.3.0 -oslo.config>=1.6.0 -oslo.serialization>=1.4.0,<2.0 -six>=1.5.2 -pbr>=0.7.0 -Jinja2 -stevedore>=0.15 -requests>=1.2.3 -urllib3>=1.7 -PyYAML==3.10 +# 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. +Babel>=1.3 # BSD +eventlet!=0.18.3,>=0.18.2 # MIT +iso8601>=0.1.9 # MIT +jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT +oslo.config>=3.7.0 # Apache-2.0 +oslo.serialization>=1.10.0 # Apache-2.0 +six>=1.9.0 # MIT +pbr>=1.6 # Apache-2.0 +Jinja2>=2.8 # BSD License (3 clause) +stevedore>=1.5.0 # Apache-2.0 +requests!=2.9.0,>=2.8.1 # Apache-2.0 +urllib3>=1.8.3 # MIT +PyYAML>=3.1.0 # MIT diff --git a/setup.py b/setup.py index cd38a49..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -1,20 +1,29 @@ -# Copyright 2014 Mirantis, Inc. +# 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 +# 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 +# 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. +# 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'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 73895a5..16f0089 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,10 +1,13 @@ -hacking>=0.8.0,<0.9 -mock==1.0.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. +hacking<0.9,>=0.8.0 +mock>=1.2 # BSD +requests-mock>=0.7.0 # Apache-2.0 +unittest2 # BSD pytest>=2.7.2 pytest-cov>=1.8.1 -requests-mock>=0.6 -unittest2==1.1.0 # this is required for the docs build jobs -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0