Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index 2946f96..d301949 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,10 +9,11 @@ requests!=2.20.0 # Apache-2.0
 robotframework>=3.0
 behave>=1.2.6
 behave-html-formatter>=0.9.4;python_version>='3.6'
-mock # BSD
+mock!=4.0.0,!=4.0.1 # BSD
 PrettyTable<0.8 # BSD
 six # MIT
 python-subunit # Apache-2.0/BSD
-os-testr # Apache-2.0
+os-testr<2.0.0;python_version=='2.7' # Apache-2.0
+os-testr;python_version>='3.6' # Apache-2.0
 junitxml
-boto3  # Apache-2.0
+boto3 # Apache-2.0

diff --git a/test-requirements.txt b/test-requirements.txt
index 1b73d4f..fa0045f 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,15 +2,16 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 coverage!=4.4 # Apache-2.0
-mock # BSD
+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;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0;python_version>='3.4' # BSD
 sphinx-rtd-theme
 yamllint
 doc8 # Apache-2.0
-bashate # Apache-2.0
+bashate<1.0.0;python_version=='2.7' # Apache-2.0
+bashate;python_version>='3.6' # Apache-2.0
 ansible-lint
 bandit