diff --git a/readme.md b/readme.md index b1ea174..8d53d3c 100644 --- a/readme.md +++ b/readme.md @@ -69,45 +69,44 @@ from various contexts of CA, CI and OCI / OS. ### Latest -| 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 | git | | +| 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 | | | ### Previous -| 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 | git | | +| 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 | | | ### Older Python -| 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 | | +| 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 | ## Tasks * try git repo url variable first for shunit -* turn readme into documentation ### sh -* fit banner to text +* implement substeps * review repositories handling for systems * opensuse * codecs repository * disable & enable https -* write unit tests +* write tests ### sh → py @@ -116,11 +115,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 @@ -136,10 +135,9 @@ 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 unit tests +* write tests diff --git a/spcd.sh b/spcd.sh index b954910..9301941 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_substep "Link alias to command" + spcd_split spcd_ln_python "${SPCD_PYTHON_COMMAND}" # venv - spcd_substep "Install virtual environment" + spcd_step "Install Python virtual environment" case "${SPCD_OS_ID}" in "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") spcd_install_package "python3-venv" ;; *) ;; esac - spcd_substep "Configure PIP" + spcd_split spcd_write "/etc/pip.conf" "\ [global] index-url = ${SPCD_URL_PYTHON} " - spcd_substep "Create virtual environment" + spcd_split "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_PYTHON_VENV}" - spcd_substep "Activate virtual environment" + spcd_split export PATH="${SPCD_PYTHON_VENV_BINARIES}:${PATH}" export VIRTUAL_ENV="${SPCD_PYTHON_VENV}" }