diff --git a/requirements.txt b/requirements.txt index 35edc89..51cb2c3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,22 +2,21 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -WebOb>=1.2.3 # MIT -Paste # MIT -Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3;python_version=='2.7' # MIT -Routes!=2.0,!=2.3.0,>=1.12.3;python_version!='2.7' # MIT -six>=1.9.0 # MIT -python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0 -keystoneauth1>=2.7.0 # Apache-2.0 -oslo.concurrency>=3.8.0 # Apache-2.0 -oslo.messaging>=5.2.0 # Apache-2.0 -oslo.policy>=1.9.0 # Apache-2.0 -oslo.serialization>=1.10.0 # Apache-2.0 -oslo.service>=1.10.0 # Apache-2.0 -oslo.utils>=3.14.0 # Apache-2.0 -python-neutronclient>=4.2.0 # Apache-2.0 -python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 -python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0 -python-glanceclient>=2.0.0 # Apache-2.0 -keystonemiddleware>=4.12.0 # Apache-2.0 -cachetools>=2.0.0 # MIT License +WebOb>=1.7.1 # MIT +Paste>=2.0.2 # MIT +Routes>=2.3.1 # MIT +six>=1.10.0 # MIT +python-keystoneclient>=3.8.0 # Apache-2.0 +keystoneauth1>=3.3.0 # Apache-2.0 +oslo.concurrency>=3.25.0 # Apache-2.0 +oslo.messaging>=5.29.0 # Apache-2.0 +oslo.policy>=1.30.0 # Apache-2.0 +oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 +oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 +oslo.utils>=3.33.0 # Apache-2.0 +python-neutronclient>=6.3.0 # Apache-2.0 +python-novaclient>=9.1.0 # Apache-2.0 +python-cinderclient>=3.3.0 # Apache-2.0 +python-glanceclient>=2.8.0 # Apache-2.0 +keystonemiddleware>=4.17.0 # Apache-2.0 +cachetools>=2.0.0 # MIT License diff --git a/setup.py b/setup.py index be0fbcd..a58a382 100644 --- a/setup.py +++ b/setup.py @@ -1,19 +1,29 @@ # Copyright 2016 Red Hat, Inc. All Rights Reserved. # -# 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>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 3c631cf..5141ba1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,16 +6,15 @@ hacking<0.11,>=0.10.0 anyjson>=0.3.3 # BSD -coverage>=3.6 # Apache-2.0 +coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -mock>=2.0 # BSD -python-subunit>=0.0.18 # Apache-2.0/BSD -testtools>=1.4.0 # MIT +mock>=2.0.0 # BSD +python-subunit>=1.0.0 # Apache-2.0/BSD +testtools>=2.2.0 # MIT testrepository>=0.0.18 # Apache-2.0/BSD -testresources>=0.2.4 # Apache-2.0/BSD +testresources>=2.0.0 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD -os-testr>=0.7.0 # Apache-2.0 -tempest>=17.1.0 # Apache-2.0 +os-testr>=1.0.0 # Apache-2.0 +tempest>=17.1.0 # Apache-2.0 bandit>=1.0.1 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -sphinx-rtd-theme +sphinx!=1.6.6,>=1.6.2 # BSD