From 1e5f018ad825f41527f42c0c0097e9c858f92256 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 27 Nov 2015 22:42:22 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Iac7b6d2a116fda68a8b5c7106b5a66119ece70a2 --- requirements.txt | 2 +- setup.py | 11 +++++++++-- test-requirements.txt | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) mode change 100755 => 100644 setup.py diff --git a/requirements.txt b/requirements.txt index 4365053..da8be00 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ pbr>=1.6 Babel>=1.3 -requests>=2.5.2,!=2.8.0 +requests>=2.8.1 six>=1.9.0 diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 70c2b3f..782bb21 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,6 +16,14 @@ # 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 5b63c16..8f224fe 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,14 +8,14 @@ discover fixtures>=1.3.1 mock>=1.2 python-subunit>=0.0.18 -oslotest>=1.1.0.0a1 +oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 testtools>=1.4.0 # HTTPretty test hanging on Travis # http://stackoverflow.com/questions/29298455/httpretty-test-hanging-on-travis # httpretty 0.8.6 seems ok -httpretty!=0.8.1,!=0.8.2,!=0.8.3,!=0.8.7,!=0.8.8,>=0.8.0 +httpretty<0.8.7,>=0.8.4 # Doc requirements sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2