summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2017-03-31 17:38:36 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2017-03-31 17:38:36 +0000
commitd7ac0ff7ca9efcc1624aae0a2431e0a5862b069f (patch)
tree588f60b4b15a9634811771418849612140b84c23
parentbabf4d2486434a3f9bf0f69cc9c295793b316e64 (diff)
Updated from global requirements1.4.01.3.0
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 31 Mar 2017 18:03:38 +0000 Reviewed-on: https://review.openstack.org/451836 Project: openstack-infra/requestsexceptions Branch: refs/heads/master
-rw-r--r--[-rwxr-xr-x]setup.py13
-rw-r--r--test-requirements.txt5
2 files changed, 15 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 186fa00..566d844 100755..100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
1#!/usr/bin/env python 1# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
2# 2#
3# Licensed under the Apache License, Version 2.0 (the "License"); 3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License. 4# you may not use this file except in compliance with the License.
@@ -13,8 +13,17 @@
13# See the License for the specific language governing permissions and 13# See the License for the specific language governing permissions and
14# limitations under the License. 14# limitations under the License.
15 15
16# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
16import setuptools 17import setuptools
17 18
19# In python < 2.7.4, a lazy loading of package `pbr` will break
20# setuptools if some other modules registered functions in `atexit`.
21# solution from: http://bugs.python.org/issue15881#msg170215
22try:
23 import multiprocessing # noqa
24except ImportError:
25 pass
26
18setuptools.setup( 27setuptools.setup(
19 setup_requires=['pbr'], 28 setup_requires=['pbr>=2.0.0'],
20 pbr=True) 29 pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 200ac9c..e069914 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1,4 @@
1hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0 1# The order of packages is significant, because pip processes them in the order
2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later.
4hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0