Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index b3e0a62..1aa2a40 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,10 +2,10 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 pbr!=2.1.0 # Apache-2.0
-stevedore # Apache-2.0
+stevedore!=3.0.0 # Apache-2.0
 PyYAML # MIT
 enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
-requests!=2.20.0 # Apache-2.0
+requests!=2.20.0,!=2.24.0 # Apache-2.0
 robotframework>=3.0
 behave>=1.2.6
 behave-html-formatter>=0.9.4;python_version>='3.6'
@@ -13,8 +13,7 @@ mock!=4.0.0,!=4.0.1 # BSD
 PrettyTable<0.8 # BSD
 six # MIT
 python-subunit # Apache-2.0/BSD
-os-testr<2.0.0;python_version=='2.7' # Apache-2.0
-os-testr;python_version>='3.6' # Apache-2.0
+os-testr # Apache-2.0
 junitxml
 boto3 # Apache-2.0
 lxml!=3.7.0 # BSD

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 fa0045f..9e729a6 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,12 +6,10 @@ mock!=4.0.0,!=4.0.1 # BSD
 nose # LGPL
 flake8<2.6.0,>=2.5.4 # 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
 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
 ansible-lint
 bandit