Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index 696f004..be07608 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 pbr!=2.1.0 # Apache-2.0
 PyYAML # MIT
-requests!=2.20.0 # Apache-2.0
+requests!=2.20.0,!=2.24.0 # Apache-2.0
 robotframework>=3.0
 scp
 cloudify-rest-client

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 7764d60..4cc86c8 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,13 +6,11 @@ mock!=4.0.0,!=4.0.1 # BSD
 nose # LGPL
 flake8 # MIT
 pylint # GPLv2
-sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0 # BSD
 sphinx-rtd-theme
 yamllint
 ansible-lint
 doc8 # Apache-2.0
-bashate<1.0.0;python_version=='2.7' # Apache-2.0
-bashate;python_version>='3.6' # Apache-2.0
+bashate # Apache-2.0
 bandit
 sphinxcontrib-spelling