From 6d262e1b4c80ef6567edf7ebcaa494e143b30a77 Mon Sep 17 00:00:00 2001 From: albailey Date: Thu, 20 May 2021 08:43:15 -0500 Subject: [PATCH] Fix zuul for bandit target Some zuul nodes running bionic do not consider the older version of pyflakes to be installable. This seems to be a cache issue. This fix updates the version of hacking defined in the top level test-requirements.txt file to use a more modern version. It also only imports yamllint if it is python 3, since the yamllint tox target is python 3 only. Partial-Bug: 1928978 Signed-off-by: albailey Change-Id: Ia7aa6a296810adc0d9ba9eca701ec70f2c4be8cd --- sysinv/sysinv/sysinv/sysinv/version.py | 2 +- test-requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/version.py b/sysinv/sysinv/sysinv/sysinv/version.py index 52ebc73521..02ee0f8bc8 100644 --- a/sysinv/sysinv/sysinv/sysinv/version.py +++ b/sysinv/sysinv/sysinv/sysinv/version.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# Copyright (c) 2013-2014 Wind River Systems, Inc. +# Copyright (c) 2013-2021 Wind River Systems, Inc. # try: diff --git a/test-requirements.txt b/test-requirements.txt index 402377d7a1..7e49a722c6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,4 @@ -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +hacking>=1.1.0,<=2.0.0 # Apache-2.0 bashate >= 0.2 PyYAML >= 3.1.0 -yamllint >= 0.5.2 +yamllint<1.26.1;python_version>="3.0" # GPLv2