From: Matthew Watkins <mwatkins@linuxfoundation.org>
Date: Tue, 7 Mar 2023 12:59:27 +0000 (+0000)
Subject: Fix!: Un-pin tox version from 3.27.1 and remove tox-pyenv
X-Git-Tag: v0.85.0~3^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=47716067d589cccf7bd65742dda468f8c8d3f858;p=releng%2Fglobal-jjb.git

Fix!: Un-pin tox version from 3.27.1 and remove tox-pyenv

Un-pin tox version from 3.27.1 and remove tox-pyenv. Testing has
demonstrated that tox-pyenv is no longer required to obtain correct
Python runtime versions when running tests. Also, removed Python 3.8
from the VENV setup where it was being specifically requested.

Due to unpinning of the tox version, tox.ini configuration files may
need modifying to reflect a change in configuration syntax; where
whitelist_externals needs to be replaced with allowlist_externals.

Issue-ID: RELENG-4539
Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
Change-Id: Ifdd49de2a8e5054dad4a5d52125ede537049ad8e
---

diff --git a/releasenotes/notes/unpin-tox-ver-rm-tox-pyenv-bf5d731d6c2ce77f.yaml b/releasenotes/notes/unpin-tox-ver-rm-tox-pyenv-bf5d731d6c2ce77f.yaml
new file mode 100644
index 00000000..734bf2fe
--- /dev/null
+++ b/releasenotes/notes/unpin-tox-ver-rm-tox-pyenv-bf5d731d6c2ce77f.yaml
@@ -0,0 +1,11 @@
+---
+fixes:
+  - |
+    Un-pin tox version from 3.27.1 and remove tox-pyenv. Testing has
+    demonstrated that tox-pyenv is no longer required to obtain correct
+    Python runtime versions when running tests. Also, removed Python 3.8
+    from the VENV setup where it was being specifically requested.
+
+    Due to unpinning of the tox version, tox.ini configuration files may
+    need modifying to reflect a change in configuration syntax; where
+    whitelist_externals needs to be replaced with allowlist_externals.
diff --git a/shell/rtd-verify.sh b/shell/rtd-verify.sh
index b1a83fad..2894122a 100644
--- a/shell/rtd-verify.sh
+++ b/shell/rtd-verify.sh
@@ -37,7 +37,7 @@ done
 # shellcheck disable=SC1090
 . ~/lf-env.sh
 
-lf-activate-venv --python python3.8 --venv-file /tmp/.toxenv tox==3.27.1 tox-pyenv virtualenv
+lf-activate-venv --venv-file /tmp/.toxenv tox virtualenv
 
 # When a new commands are added in lftools, the docs verify job needs to
 # run the new command which requires installing the lftools dev version
diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 488b5c8e..e4bb50db 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -17,7 +17,7 @@ set -eux -o pipefail
 # shellcheck disable=SC1090
 source ~/lf-env.sh
 
-lf-activate-venv --python python3.8 --venv-file /tmp/.toxenv tox==3.27.1 tox-pyenv virtualenv
+lf-activate-venv --venv-file /tmp/.toxenv tox virtualenv
 
 # installs are silent, show version details in log
 $PYTHON --version
diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 56c450f0..ce527cf6 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -24,7 +24,7 @@ cd "$WORKSPACE/$TOX_DIR" || exit 1
 # shellcheck disable=SC1090
 source ~/lf-env.sh
 
-lf-activate-venv --python python3.8 --venv-file /tmp/.toxenv tox==3.27.1 tox-pyenv virtualenv
+lf-activate-venv --venv-file /tmp/.toxenv tox virtualenv
 
 if [[ -d /opt/pyenv ]]; then
     echo "---> Setting up pyenv"