aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-08-06 01:42:10 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-08-06 01:42:10 +0200
commit982ec6816ccf3b96eda0fa7247841998c55afba2 (patch)
treea4e3af6bec8c34327ea88d07aae26d967914330e
parent41d8a752c2c1d2dc2d6c7f9e465891ae725195ed (diff)
Updated from global requirements
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: Ibcac0888c7b62d6f59cea7dea021cf64610d38c1
-rw-r--r--requirements.txt2
-rw-r--r--setup.py8
-rw-r--r--test-requirements.txt6
3 files changed, 3 insertions, 13 deletions
diff --git a/requirements.txt b/requirements.txt
index 696f004c8..be0760858 100644
--- 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 566d84432..f63cc23c5 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 7764d60cb..4cc86c858 100644
--- 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