From b1884e6e8c00e9aa48816a80a3c0da465f8c7bab Mon Sep 17 00:00:00 2001
From: Marek Szwałkiewicz <marek.szwalkiewicz@external.t-mobile.pl>
Date: Fri, 14 Apr 2023 13:52:30 +0200
Subject: Fix documentation tests and structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove deprecated whitelist_externals from tox.ini and
move docs/source to docs/. to satisfy the doc-rules

Issue-ID: INT-2221
Change-Id: I3162eccd91685b98972277b1f8f41b923321889a
Signed-off-by: Marek Szwałkiewicz <marek.szwalkiewicz@external.t-mobile.pl>
---
 tox.ini | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index b068f01..ef6cea4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,16 +6,19 @@ requires = pip >= 8
 
 [testenv]
 basepython = python3.8
-whitelist_externals =
+allowlist_externals =
   git
   bash
+  /bin/bash
+  sh
+  /bin/sh
 deps =
   coala-bears
   nodeenv
 
 [testenv:json]
 commands_pre =
-    /bin/sh -c "git --no-pager diff HEAD HEAD^ --name-only '*.json' > /tmp/.coalist_json"
+    /bin/sh -c "git --no-pager diff HEAD^ HEAD --name-only '*.json' > /tmp/.coalist_json"
 commands =
 # '\ ' at the end of command is needed for a case where above command returns empty list (it adds empty file
 # parameter to '--files' opt
@@ -23,7 +26,7 @@ commands =
 
 [testenv:yaml]
 commands_pre =
-    /bin/sh -c "git --no-pager diff HEAD HEAD^ --name-only '*.yaml' '*.yml' > /tmp/.coalist_yaml"
+    /bin/sh -c "git --no-pager diff HEAD^ HEAD --name-only '*.yaml' '*.yml' > /tmp/.coalist_yaml"
 commands =
 # '\ ' at the end of command is needed for a case where above command returns empty list (it adds empty file
 # parameter to '--files' opt
@@ -31,26 +34,26 @@ commands =
 
 [testenv:py]
 commands_pre =
-    /bin/sh -c "git --no-pager diff HEAD HEAD^ --name-only '*.py' > /tmp/.coalist_py"
+    /bin/sh -c "git --no-pager diff HEAD^ HEAD --name-only '*.py' > /tmp/.coalist_py"
 commands =
     /bin/bash -c "coala --non-interactive --disable-caching --no-autoapply-warn py --files $(</tmp/.coalist_py) \ "
 
 [testenv:rst]
 commands_pre =
-    /bin/sh -c "git --no-pager diff HEAD HEAD^ --name-only '*.rst' > /tmp/.coalist_rst"
+    /bin/sh -c "git --no-pager diff HEAD^ HEAD --name-only '*.rst' > /tmp/.coalist_rst"
 deps =
     -r{toxinidir}/docs/requirements-docs.txt
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt
     -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt
 commands =
-  /bin/sh -c "sphinx-build -n -b html docs/source docs/build/html $(</tmp/.coalist_rst)"
-  /bin/sh -c "sphinx-build -n -b linkcheck docs/source docs/build/linkcheck $(</tmp/.coalist_rst)"
+  /bin/sh -c "sphinx-build -n -b html docs docs/build/html $(</tmp/.coalist_rst)"
+  /bin/sh -c "sphinx-build -n -b linkcheck docs docs/build/linkcheck $(</tmp/.coalist_rst)"
 
 [testenv:md]
 commands_pre =
     nodeenv -p --verbose
     npm install --global remark-cli
-    /bin/sh -c "git --no-pager diff HEAD HEAD^ --name-only '*.md' > /tmp/.coalist_md"
+    /bin/sh -c "git --no-pager diff HEAD^ HEAD --name-only '*.md' > /tmp/.coalist_md"
 commands =
     /bin/bash -c "coala --non-interactive --disable-caching --no-autoapply-warn md --files $(</tmp/.coalist_md) \ "
 
-- 
cgit 1.2.3-korg