From fea6fbebca5451ccd0e319d27eb0c246411aa9b2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 7 Aug 2024 21:02:02 +0200 Subject: [PATCH] =?UTF-8?q?=E2=88=92os/pelican,ruff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 30 +++++++++++++++--------------- spcd.sh | 20 -------------------- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/readme.md b/readme.md index 67d7ffb..4375e83 100644 --- a/readme.md +++ b/readme.md @@ -62,22 +62,22 @@ from various contexts of CA, CI and OCI / OS. ## Packages -| os | https | updt-ca | py | graphviz | plantuml | shchk | sphinx | shfmt | pelican | ruff | -|:----------------|---|---|:------------|:------|:----------|:-----|:----|:-----|:----|:----| -| Arch 20240101 | ☑ | ☑ | 3.12 | 12.0 | 1.2023.13 | 0.10 | 7.4 | 3.8 | 4.9 | 0.5 | -| Fedora 40 | ☑ | ☑ | 3.12 → 3.13 | 9.0 | 1.2024.6 | 0.9 | 7.2 | 3.7 | 4.8 | 0.4 | -| Alpine 3.20 | ☑ | ☐ | 3.12 | 9.0 | 1.2024.4 | 0.10 | 7.2 | 3.8 | | 0.4 | -| Ubuntu Noble | ☐ | ☐ | 3.12 | u2.42 | u1.2020.2 | u0.9 | 7.2 | u3.8 | 4.9 | | -| Debian Bookworm | ☐ | ☐ | 3.11 | 2.42 | 1.2020.2 | 0.9 | 5.3 | 3.6 | 4.8 | | -| Alma / Rocky 9 | ☑ | ☑ | 3.9 → 3.12 | 2.44 | e1.2024.6 | e0.8 | | | | | +| os | https | updt-ca | py | graphviz | plantuml | shellcheck | sphinx | shfmt | +|:----------------|---|---|:------------|:------|:----------|:-----|:----|:-----| +| Arch 20240101 | ☑ | ☑ | 3.12 | 12.0 | 1.2023.13 | 0.10 | 7.4 | 3.8 | +| Fedora 40 | ☑ | ☑ | 3.12 → 3.13 | 9.0 | 1.2024.6 | 0.9 | 7.2 | 3.7 | +| Alpine 3.20 | ☑ | ☐ | 3.12 | 9.0 | 1.2024.4 | 0.10 | 7.2 | 3.8 | +| Ubuntu Noble | ☐ | ☐ | 3.12 | u2.42 | u1.2020.2 | u0.9 | 7.2 | u3.8 | +| Debian Bookworm | ☐ | ☐ | 3.11 | 2.42 | 1.2020.2 | 0.9 | 5.3 | 3.6 | +| Alma / Rocky 9 | ☑ | ☑ | 3.9 → 3.12 | 2.44 | e1.2024.6 | e0.8 | | | -| os | https | updt-ca | py | graphviz | plantuml | shchk | sphinx | shfmt | pelican | ruff | -|:----------------|---|---|:------------|:------|:----------|:-----|:----|:-----|:----|:----| -| Fedora 39 | ☑ | ☑ | 3.12 → 3.13 | 8.1 | 1.2024.6 | 0.9 | 6.2 | 3.5 | 4.8 | 0.4 | -| Alpine 3.19 | ☑ | ☐ | 3.11 | 9.0 | 1.2023.12 | 0.9 | 6.2 | 3.7 | | | -| Ubuntu Jammy | ☐ | ☐ | 3.10 | u2.42 | u1.2020.2 | u0.8 | 4.3 | u3.4 | 4.7 | | -| Debian Bullseye | ☐ | ☐ | 3.9 | 2.42 | 1.2020.2 | 0.7 | 3.4 | | 4.0 | | -| Alma / Rocky 8 | ☑ | ☑ | 3.6 → 3.12 | 2.40 | e1.2024.6 | e0.6 | | | | | +| os | https | updt-ca | py | graphviz | plantuml | shellcheck | sphinx | shfmt | +|:----------------|---|---|:------------|:------|:----------|:-----|:----|:-----| +| Fedora 39 | ☑ | ☑ | 3.12 → 3.13 | 8.1 | 1.2024.6 | 0.9 | 6.2 | 3.5 | +| Alpine 3.19 | ☑ | ☐ | 3.11 | 9.0 | 1.2023.12 | 0.9 | 6.2 | 3.7 | +| Ubuntu Jammy | ☐ | ☐ | 3.10 | u2.42 | u1.2020.2 | u0.8 | 4.3 | u3.4 | +| Debian Bullseye | ☐ | ☐ | 3.9 | 2.42 | 1.2020.2 | 0.7 | 3.4 | | +| Alma / Rocky 8 | ☑ | ☑ | 3.6 → 3.12 | 2.40 | e1.2024.6 | e0.6 | | | ## Tasks diff --git a/spcd.sh b/spcd.sh index e105c3c..5bdb9db 100644 --- a/spcd.sh +++ b/spcd.sh @@ -624,17 +624,6 @@ spcd_install_packages() { # plantuml spcd_step "Install PlantUML" spcd_install_package "plantuml" - # python pelican - spcd_step "Install Python Pelican" - case "${SPCD_OS_ID}" in - "${SPCD_OS_ARCH}" | "${SPCD_OS_DEBIAN}" | "${SPCD_OS_UBUNTU}") - spcd_install_package "pelican" - ;; - "${SPCD_OS_FEDORA}") - spcd_install_package "python3-pelican" - ;; - *) ;; - esac # python sphinx spcd_step "Install Python Sphinx" case "${SPCD_OS_ID}" in @@ -659,15 +648,6 @@ spcd_install_packages() { # rsync spcd_step "Install Rsync" spcd_install_package "rsync" - # ruff - spcd_step "Install Ruff" - case "${SPCD_OS_ID}" in - "${SPCD_OS_ALPINE}") - [ "${SPCD_OS_VERSION}" != "3.19" ] && spcd_install_package "ruff" - ;; - "${SPCD_OS_ARCH}" | "${SPCD_OS_FEDORA}") spcd_install_package "ruff" ;; - *) ;; - esac # shell check spcd_step "Install ShellCheck" case "${SPCD_PM}" in