diff --git a/requirements.txt b/requirements.txt index d0b8d220..a0174dbe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,10 @@ -oslo.config -oslo.log +# 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. +oslo.config>=3.14.0 # Apache-2.0 +oslo.log>=1.14.0 # Apache-2.0 -six>=1.9.0 +six>=1.9.0 # MIT #influxdb==2.8.0 #cassandra-driver>=2.1.4,!=3.6.0 # Apache-2.0 -monasca-common +monasca-common>=1.0.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 13e75b0b..782bb21f 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,4 @@ -#!/usr/bin/env python - -# Copyright (c) 2014 Hewlett-Packard Development Company, L.P. +# 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. @@ -15,8 +13,17 @@ # 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 fe61f878..964466aa 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,6 @@ -hacking>=0.11.0,<0.12 # Apache-2.0 -nose -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.12,>=0.11.0 # Apache-2.0 +nose # LGPL +mock>=2.0 # BSD