From 9f0bd462212b85b351a7547ed881f17fa22149e2 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Tue, 8 Sep 2015 12:08:29 -0700 Subject: [PATCH] Update from global requirements Change-Id: Ia7bad85e9a78b4ed23de608dbaed4c90b9f606f3 --- setup.py | 31 ++++++++++++++++++++----------- test-requirements.txt | 23 +++++++++++++---------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/setup.py b/setup.py index 7fc6985..d8080d0 100644 --- a/setup.py +++ b/setup.py @@ -1,20 +1,29 @@ -# Copyright 2015 Akanda, 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. - +# 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.3'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 43d8826..570b635 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,12 +1,15 @@ +# 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. unittest2 nose -coverage -mock>=0.8.0 -pep8 -eventlet==0.12.1 -iso8601 -python-novaclient -WebOb==1.2.3 -mox==0.5.3 -testtools -fixtures +coverage>=3.6 +mock>=1.2 +pep8==1.5.7 +eventlet>=0.17.4 +iso8601>=0.1.9 +python-novaclient>=2.28.1 +WebOb>=1.2.3 +mox>=0.5.3 +testtools>=1.4.0 +fixtures>=1.3.1