Refactor: Cleanup some pre-commit issues

* Cleanup some pre-commit issues
* Re-enable pre-commit as part of the default tox run
* Fix shellcheck error

Issue: RELENG-4563
Change-Id: I40b94b8dd2512118ebe0afcac556a42161cedbc8
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/ansible-playbook.sh b/ansible-playbook.sh
index 490b63a..3f7b6a9 100755 (executable)
--- a/ansible-playbook.sh
+++ b/ansible-playbook.sh
@@ -10,6 +10,7 @@
 ##############################################################################
 
 if command -v "$(cat /tmp/.ansible_venv)/bin/ansible-playbook" &> /dev/null; then
+    # shellcheck source=/dev/null
     source "$(cat /tmp/.ansible_venv)/bin/activate" && ANSIBLE_FORCE_COLOR=1 \
         PYTHONUNBUFFERED=1 "$(cat /tmp/.ansible_venv)/bin/ansible-playbook" "$@"
 elif command -v "$(which ansible-playbook)"; then

diff --git a/releasenotes/notes/get-ansible-from-pypi-702606c724a84d26.yaml b/releasenotes/notes/get-ansible-from-pypi-702606c724a84d26.yaml
index de499f5..3c4c717 100644 (file)
--- a/releasenotes/notes/get-ansible-from-pypi-702606c724a84d26.yaml
+++ b/releasenotes/notes/get-ansible-from-pypi-702606c724a84d26.yaml
@@ -1,6 +1,6 @@
 ---
 prelude: >
-    Install ansible and ansible-playbook using PyPI.
+  Install ansible and ansible-playbook using PyPI.
 issues:
   - |
     Error:

diff --git a/tox.ini b/tox.ini
index 851bb68..d21c3e3 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ minversion = 1.6
 envlist =
     docs,
     docs-linkcheck,
-#    pre-commit
+    pre-commit
 skipsdist = true
 
 [testenv:docs]