Updated from global requirements

Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: I3a60f9916ff96b1820c72bb9b45b3c919baeade1

diff --git a/setup.py b/setup.py
index 566d844..f63cc23 100644 (file)
--- 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 5f3aae2..5681cab 100644 (file)
--- 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