From f9a862b5d80943b76cd71dab84c765f9b17af89e Mon Sep 17 00:00:00 2001 From: albailey Date: Tue, 18 May 2021 11:06:17 -0500 Subject: [PATCH] Fixing pylint failures in zuul. pylint running in python3.8 will complain about some code such as 'import contextlib' Rather than destabilize the code, specify python3.6 for the pylint job. When python2 is fully dropped, the changes can be addressed. The zuul nodeset for bionic sets up a venv for python3.6 Closes-Bug: #1928841 Signed-off-by: albailey Change-Id: Ib2e7f467ce20e5b31aef7242405ef034583d4e1a --- .zuul.yaml | 1 + sysinv/sysinv/sysinv/sysinv/helm/common.py | 2 +- sysinv/sysinv/sysinv/tox.ini | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 6b1f01e7d1..b527a323e5 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -88,6 +88,7 @@ parent: tox description: | Run pylint test for sysinv + nodeset: ubuntu-bionic required-projects: - starlingx/fault - starlingx/update diff --git a/sysinv/sysinv/sysinv/sysinv/helm/common.py b/sysinv/sysinv/sysinv/sysinv/helm/common.py index 8b7ea7d81c..8abc1f4274 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/common.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/common.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2020 Wind River Systems, Inc. +# Copyright (c) 2018-2021 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # diff --git a/sysinv/sysinv/sysinv/tox.ini b/sysinv/sysinv/sysinv/tox.ini index 5150967d85..2d79aa81d0 100644 --- a/sysinv/sysinv/sysinv/tox.ini +++ b/sysinv/sysinv/sysinv/tox.ini @@ -164,7 +164,7 @@ deps = -r{toxinidir}/test-requirements.txt commands = bandit --ini tox.ini -n 5 -r sysinv [testenv:pylint] -basepython = python3 +basepython = python3.6 commands = pylint {posargs} sysinv --rcfile=./pylint.rc