From cb39f1678854b9f19529f896100fe78118b51d63 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 14 Nov 2017 21:01:26 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ibad2fa864e2772f953289d9316455a9ff1250b2f --- setup.py | 17 ++++++++++++----- test-requirements.txt | 10 +++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 48fd53a..566d844 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python -# Copyright (c) 2016 Internap 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. @@ -15,8 +14,16 @@ # limitations under the License. # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT - import setuptools -setuptools.setup(setup_requires=['pbr'], - pbr=True) +# 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>=2.0.0'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 51ce3c0..ae8c323 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,14 +3,14 @@ # process, which may cause wedges in the gate later. bashate>=0.2 # Apache-2.0 flake8<2.6.0,>=2.5.4 # MIT -pyasn1 # BSD +pyasn1!=0.2.3 # BSD pyOpenSSL>=0.14 # Apache-2.0 -requests>=2.10.0 # Apache-2.0 +requests>=2.14.2 # Apache-2.0 ndg-httpsclient>=0.4.2;python_version<'3.0' # BSD # this is required for the docs build jobs -sphinx!=1.3b1,<1.4,>=1.2.1 # BSD -openstackdocstheme>=1.11.0 # Apache-2.0 +sphinx>=1.6.2 # BSD +openstackdocstheme>=1.16.0 # Apache-2.0 doc8 # Apache-2.0 -reno>=1.8.0 # Apache-2.0 +reno!=2.3.1,>=1.8.0 # Apache-2.0 sphinxmark>=0.1.14 # Apache-2.0