From 9c0391412b124105fa75d971eb020782601eaa7d Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Wed, 29 Apr 2020 12:41:11 +0200 Subject: [PATCH] Updated from global requirements MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédric Ollivier Change-Id: I56dd1b8370ebe3e8e7f378a1fb3a9966a3c3d806 --- requirements.txt | 7 ++++--- test-requirements.txt | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2946f962..d3019492 100644 --- 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 1b73d4f2..fa0045ff 100644 --- 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 -- 2.16.6