From 96fa7cb9ca187657d451065ef1c8bc37179164b6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 21 Aug 2024 12:25:50 +0200 Subject: [PATCH 1/4] =?UTF-8?q?shfmt=20=E2=86=94=20shunit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/readme.md b/readme.md index 8d53d3c..49936fb 100644 --- a/readme.md +++ b/readme.md @@ -69,31 +69,31 @@ from various contexts of CA, CI and OCI / OS. ### Latest -| os | https | updt-ca | python | graphviz | plantuml | shellcheck | shfmt | shunit | -|:----------------|---|---|------------:|------:|-----------:|------:|-----:|------:| -| Arch 20240818 | ☑ | ☑ | 3.12 | 12.0 | 1.2023.13 | 0.10 | 3.8 | 2.1.8 | -| Alpine 3.20 | ☑ | ☐ | 3.12 | 9.0 | 1.2024.4 | 0.10 | 3.8 | 2.1.8 | -| Fedora 40 | ☑ | ☑ | 3.12 → 3.13 | 9.0 | 1.2024.6 | 0.9 | 3.7 | 2.1.6 | -| Debian Bookworm | ☐ | ☐ | 3.11 | 2.42 | 1.2020.2 | 0.9 | 3.6 | 2.1.8 | -| OpenSUSE 15.6 | ☐ | ☑ | 3.6 → 3.12 | 2.48 | 1.2020.9 | 0.8 | 3.5 | 2.1.6 | -| Ubuntu Noble | ☐ | ☐ | 3.12 | u2.42 | u1.2020.2 | u0.9 | u3.8 | 2.1.8 | -| Alma / Rocky 9 | ☑ | ☑ | 3.9 → 3.12 | 2.44 | e1.2024.6 | e0.8 | | | +| os | https | updt-ca | python | graphviz | plantuml | shellcheck | shunit | shfmt | +|:----------------|---|---|------------:|------:|-----------:|------:|------:|-----:| +| Arch 20240818 | ☑ | ☑ | 3.12 | 12.0 | 1.2023.13 | 0.10 | 2.1.8 | 3.8 | +| Alpine 3.20 | ☑ | ☐ | 3.12 | 9.0 | 1.2024.4 | 0.10 | 2.1.8 | 3.8 | +| Fedora 40 | ☑ | ☑ | 3.12 → 3.13 | 9.0 | 1.2024.6 | 0.9 | 2.1.6 | 3.7 | +| Debian Bookworm | ☐ | ☐ | 3.11 | 2.42 | 1.2020.2 | 0.9 | 2.1.8 | 3.6 | +| OpenSUSE 15.6 | ☐ | ☑ | 3.6 → 3.12 | 2.48 | 1.2020.9 | 0.8 | 2.1.6 | 3.5 | +| Ubuntu Noble | ☐ | ☐ | 3.12 | u2.42 | u1.2020.2 | u0.9 | 2.1.8 | u3.8 | +| Alma / Rocky 9 | ☑ | ☑ | 3.9 → 3.12 | 2.44 | e1.2024.6 | e0.8 | | | ### Previous -| os | https | updt-ca | python | graphviz | plantuml | shellcheck | shfmt | shunit | -|:----------------|---|---|------------:|------:|-----------:|------:|-----:|------:| -| Alpine 3.19 | ☑ | ☐ | 3.11 | 9.0 | 1.2023.12 | 0.9 | 3.7 | 2.1.8 | -| Fedora 39 | ☑ | ☑ | 3.12 → 3.13 | 8.1 | 1.2024.6 | 0.9 | 3.5 | 2.1.6 | -| OpenSUSE 15.5 | ☐ | ☑ | 3.6 → 3.11 | 2.48 | 1.2020.9 | 0.8 | 3.5 | 2.1.6 | -| Alma / Rocky 8 | ☑ | ☑ | 3.6 → 3.12 | 2.40 | e1.2024.6 | e0.6 | | | +| os | https | updt-ca | python | graphviz | plantuml | shellcheck | shunit | shfmt | +|:----------------|---|---|------------:|------:|-----------:|------:|------:|-----:| +| Alpine 3.19 | ☑ | ☐ | 3.11 | 9.0 | 1.2023.12 | 0.9 | 2.1.8 | 3.7 | +| Fedora 39 | ☑ | ☑ | 3.12 → 3.13 | 8.1 | 1.2024.6 | 0.9 | 2.1.6 | 3.5 | +| OpenSUSE 15.5 | ☐ | ☑ | 3.6 → 3.11 | 2.48 | 1.2020.9 | 0.8 | 2.1.6 | 3.5 | +| Alma / Rocky 8 | ☑ | ☑ | 3.6 → 3.12 | 2.40 | e1.2024.6 | e0.6 | | | ### Older Python -| os | https | updt-ca | python | graphviz | plantuml | shellcheck | shfmt | shunit | -|:----------------|---|---|------------:|------:|-----------:|------:|-----:|------:| -| Ubuntu Jammy | ☐ | ☐ | 3.10 | u2.42 | u1.2020.2 | u0.8 | u3.4 | 2.1.6 | -| Debian Bullseye | ☐ | ☐ | 3.9 | 2.42 | 1.2020.2 | 0.7 | | 2.1.6 | +| os | https | updt-ca | python | graphviz | plantuml | shellcheck | shunit | shfmt | +|:----------------|---|---|------------:|------:|-----------:|------:|------:|-----:| +| Ubuntu Jammy | ☐ | ☐ | 3.10 | u2.42 | u1.2020.2 | u0.8 | 2.1.6 | u3.4 | +| Debian Bullseye | ☐ | ☐ | 3.9 | 2.42 | 1.2020.2 | 0.7 | 2.1.6 | | ## Tasks From ece2217c083791b3e7e0654faba6012eca5a9988 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 21 Aug 2024 12:27:14 +0200 Subject: [PATCH 2/4] shunit/git --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 49936fb..8ef3dd6 100644 --- a/readme.md +++ b/readme.md @@ -77,7 +77,7 @@ from various contexts of CA, CI and OCI / OS. | Debian Bookworm | ☐ | ☐ | 3.11 | 2.42 | 1.2020.2 | 0.9 | 2.1.8 | 3.6 | | OpenSUSE 15.6 | ☐ | ☑ | 3.6 → 3.12 | 2.48 | 1.2020.9 | 0.8 | 2.1.6 | 3.5 | | Ubuntu Noble | ☐ | ☐ | 3.12 | u2.42 | u1.2020.2 | u0.9 | 2.1.8 | u3.8 | -| Alma / Rocky 9 | ☑ | ☑ | 3.9 → 3.12 | 2.44 | e1.2024.6 | e0.8 | | | +| Alma / Rocky 9 | ☑ | ☑ | 3.9 → 3.12 | 2.44 | e1.2024.6 | e0.8 | git | | ### Previous @@ -86,7 +86,7 @@ from various contexts of CA, CI and OCI / OS. | Alpine 3.19 | ☑ | ☐ | 3.11 | 9.0 | 1.2023.12 | 0.9 | 2.1.8 | 3.7 | | Fedora 39 | ☑ | ☑ | 3.12 → 3.13 | 8.1 | 1.2024.6 | 0.9 | 2.1.6 | 3.5 | | OpenSUSE 15.5 | ☐ | ☑ | 3.6 → 3.11 | 2.48 | 1.2020.9 | 0.8 | 2.1.6 | 3.5 | -| Alma / Rocky 8 | ☑ | ☑ | 3.6 → 3.12 | 2.40 | e1.2024.6 | e0.6 | | | +| Alma / Rocky 8 | ☑ | ☑ | 3.6 → 3.12 | 2.40 | e1.2024.6 | e0.6 | git | | ### Older Python From 8166893506191a32e8c6413874f7947f64cc3d56 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 21 Aug 2024 12:38:38 +0200 Subject: [PATCH 3/4] readme/tasks --- readme.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index 8ef3dd6..b1ea174 100644 --- a/readme.md +++ b/readme.md @@ -98,15 +98,16 @@ from various contexts of CA, CI and OCI / OS. ## Tasks * try git repo url variable first for shunit +* turn readme into documentation ### sh -* implement substeps +* fit banner to text * review repositories handling for systems * opensuse * codecs repository * disable & enable https -* write tests +* write unit tests ### sh → py @@ -115,11 +116,11 @@ from various contexts of CA, CI and OCI / OS. * epel * plantuml * shellcheck - * shunit | bats * graphviz * openssh * rsync * shfmt + * shunit * python virtual environment * install system package * configure pip @@ -135,9 +136,10 @@ from various contexts of CA, CI and OCI / OS. * .sh * maximum line length * detect ssh private key type +* fit banner to text * implement substeps * list sys.path * set workflow templates * actions * includes -* write tests +* write unit tests From 37e6767612930c6bf93b4b8aadaabae69bcf42a5 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 21 Aug 2024 12:44:50 +0200 Subject: [PATCH 4/4] python substeps --- spcd.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spcd.sh b/spcd.sh index 9301941..b954910 100644 --- a/spcd.sh +++ b/spcd.sh @@ -669,24 +669,24 @@ spcd_install_git() { spcd_install_python() { spcd_step "Install Python" spcd_install_package "${SPCD_PYTHON_PACKAGE}" - spcd_split + spcd_substep "Link alias to command" spcd_ln_python "${SPCD_PYTHON_COMMAND}" # venv - spcd_step "Install Python virtual environment" + spcd_substep "Install virtual environment" case "${SPCD_OS_ID}" in "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") spcd_install_package "python3-venv" ;; *) ;; esac - spcd_split + spcd_substep "Configure PIP" spcd_write "/etc/pip.conf" "\ [global] index-url = ${SPCD_URL_PYTHON} " - spcd_split + spcd_substep "Create virtual environment" "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_PYTHON_VENV}" - spcd_split + spcd_substep "Activate virtual environment" export PATH="${SPCD_PYTHON_VENV_BINARIES}:${PATH}" export VIRTUAL_ENV="${SPCD_PYTHON_VENV}" }