From 08130cd6252a1e44923bdc15ec060ef6d305322c Mon Sep 17 00:00:00 2001
From: albailey <Al.Bailey@windriver.com>
Date: Fri, 18 Dec 2020 07:45:40 -0600
Subject: [PATCH] Fix zuul jobs broken due to pip upversion

python 2.7 zuul jobs such as py27 and pylint could fail
when trying to import bandit using the new pip
since bandit 1.7 was released Dec 12 and is python3 only.

The cpp file header was only changed in this review to
trigger the appropriate zuul jobs.

Partial-Bug: #1907678
Change-Id: Idb1e97d16773d36027d29f4eb100d8b453a8069f
Signed-off-by: albailey <Al.Bailey@windriver.com>
---
 fm-common/sources/fmTime.cpp | 2 +-
 test-requirements.txt        | 4 ++--
 tox.ini                      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fm-common/sources/fmTime.cpp b/fm-common/sources/fmTime.cpp
index f6a2a588..fe3cc100 100644
--- a/fm-common/sources/fmTime.cpp
+++ b/fm-common/sources/fmTime.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2014 Wind River Systems, Inc.
+// Copyright (c) 2020 Wind River Systems, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
diff --git a/test-requirements.txt b/test-requirements.txt
index 2d6552d7..7edf7389 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,5 +3,5 @@ bashate >= 0.2
 mock
 PyYAML >= 3.1.0
 yamllint >= 0.5.2
-#spec_cleaner>=1.0.9
-bandit>=1.1.0,<=1.6.2
+isort<5;python_version>="3.5"
+bandit;python_version>="3.5"
diff --git a/tox.ini b/tox.ini
index e9a504dc..862ec5d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,7 +51,7 @@ commands =
             -print0 | xargs -0 yamllint -d '\{extends: relaxed, rules: \{line-length: \{max: 260\}\}\}'"
 
 [testenv:pylint]
-basepython = python2.7
+basepython = python3
 sitepackages = False
 
 deps = {[testenv]deps}
@@ -109,7 +109,7 @@ show-source = True
 ignore = H102,H104,H105,H301,H306,H401,H403,H404,H405,H702,H903,
          W504,W605,E123,E125,E501,E402,W504,W605,E117,F633,F841,E741,E117,F632
 exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,release-tag-*
-# TODO: H106 Don’t put vim configuration in source files (off by default).
+# TODO: H106 Do not put vim configuration in source files (off by default).
 # H203 Use assertIs(Not)None to check for None (off by default).
 # TODO: H904 Delay string interpolations at logging calls (off by default).
 enable-extensions = H203