Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index c997c36..696f004 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ requests!=2.20.0 # Apache-2.0
 robotframework>=3.0
 scp
 cloudify-rest-client
-mock # BSD
+mock!=4.0.0,!=4.0.1 # BSD
 PrettyTable<0.8 # BSD
 six # MIT
 paramiko # LGPLv2.1+

diff --git a/test-requirements.txt b/test-requirements.txt
index e6deb99..7764d60 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,16 +2,17 @@
 # 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 # 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
 ansible-lint
 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
 bandit
 sphinxcontrib-spelling