From 0666ef783ba5d2ccba1fd8e19d1c265c8fb42e07 Mon Sep 17 00:00:00 2001
From: Ron Stone <ronald.stone@windriver.com>
Date: Tue, 30 Apr 2024 16:20:32 +0000
Subject: [PATCH] Upver tox and sphinx (r9, r8, r7, r6, r5)

Bump to tox 4, docultils 18.1 and sphinx 7

Change-Id: I8664bbd473b84be0b8c90db16ecd280bb9f8b077
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
---
 .zuul.yaml           |  3 ++-
 doc/requirements.txt |  4 ++--
 tox.ini              | 25 +++++++++++++------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 0cbce6540..f098215e1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,8 @@
 ---
 - project:
     vars:
-      ensure_tox_version: '<4'
+      # ensure_tox_version: '<4'
+      ensure_tox_version: '>=4.14.2'
     templates:
       - stx-api-ref-jobs
     check:
diff --git a/doc/requirements.txt b/doc/requirements.txt
index e92544db9..ee75d7535 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,7 +1,7 @@
 #sphinx==4.2.0
-sphinx==5.0
+sphinx==7.0
 openstackdocstheme>=2.2.1,<=2.3.1 # Apache-2.0
-docutils==0.17.1
+docutils==0.18.1
 PyYAML==6.0
 sphinx-tabs<=3.4.1
 
diff --git a/tox.ini b/tox.ini
index a0d412724..2c6a9f825 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_CAPTURE=1
          OS_STDERR_CAPTURE=1
          OS_TEST_TIMEOUT=60
+         LC_ALL=C
 deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:prebuild-docs]
@@ -40,10 +41,10 @@ commands =
   sphinx-build -a -E -W --keep-going -d doc/build/doctrees -t starlingx -t openstack -t virtual -b html doc/source doc/build/html {posargs}
   {[testenv:postbuild-docs]commands}
 # Note: The dev env for the docs team uses a version of tox that does not yet support allowlist_externals
-whitelist_externals = bash
-                      hide-empty-rows.sh
-                      htmlChecks.sh
-                      get-remote-files.sh
+allowlist_externals = bash
+                      ./hide-empty-rows.sh
+                      ./htmlChecks.sh
+                      ./get-remote-files.sh
                       git
 #                      hw-updates.sh
 
@@ -55,10 +56,10 @@ commands =
   {[testenv:prebuild-docs]commands}
   sphinx-build -a -E -W --keep-going -d doc/build/doctrees -t starlingx -t openstack -b singlehtml doc/source doc/build/singlepage {posargs}
   {[testenv:postbuild-docs]commands} 
-whitelist_externals = bash
-                      hide-empty-rows.sh
-                      htmlChecks.sh
-                      get-remote-files.sh
+allowlist_externals = bash
+                      ./hide-empty-rows.sh
+                      ./htmlChecks.sh
+                      ./get-remote-files.sh
                       git
 
 [testenv:api-ref]
@@ -66,10 +67,10 @@ deps = {[testenv:docs]deps}
 commands =
   rm -rf api-ref/build
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
-whitelist_externals = rm
+allowlist_externals = rm
 
 [testenv:linters]
-whitelist_externals = bash
+allowlist_externals = bash
 commands =
   bash -c "find {toxinidir}                   \
             \( -name .tox -prune \)           \
@@ -87,13 +88,13 @@ passenv=PWD
 commands =
        bash -c "echo Running in {env:PWD}"
        bash new-topic.sh {env:PWD} {toxinidir}
-whitelist_externals = new-topic.sh
+allowlist_externals = ./new-topic.sh
                       bash
 
 [testenv:picks]
 commands =
        ./pickCompare.sh
-whitelist_externals = pickCompare.sh
+allowlist_externals = ./pickCompare.sh
                       bash