From 60de4f8c8cc6397e80e08c0461b7c5532989a140 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 6 Aug 2020 01:40:15 +0200 Subject: Updated from global requirements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédric Ollivier Change-Id: I3a60f9916ff96b1820c72bb9b45b3c919baeade1 --- setup.py | 8 -------- test-requirements.txt | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 566d8443..f63cc23c 100644 --- a/setup.py +++ b/setup.py @@ -16,14 +16,6 @@ # 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>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 5f3aae26..5681cabf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,6 +8,5 @@ flake8<2.6.0,>=2.5.4 # MIT pylint # GPLv2 yamllint ansible-lint -bashate<1.0.0;python_version=='2.7' # Apache-2.0 -bashate;python_version>='3.6' # Apache-2.0 +bashate # Apache-2.0 bandit -- cgit