From d57311f7849c61baf0076e7dce066181edb5af4c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 7 Aug 2024 13:06:24 +0200 Subject: [PATCH 1/3] pip/sphinx-rtd-theme --- spcd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spcd.sh b/spcd.sh index d081c44..ef7fad4 100644 --- a/spcd.sh +++ b/spcd.sh @@ -713,7 +713,7 @@ index-url = ${SPCD_URL_PYTHON} pip install \ "pelican" \ "ruff" \ - "sphinx" + "sphinx" "sphinx-rtd-theme" } spcd_install_python_modules() { From 105216c6ec302a4d4eb000b242232d7bd331d815 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 7 Aug 2024 13:07:49 +0200 Subject: [PATCH 2/3] fix pypi url --- readme.md | 2 +- spcd.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 1c9ea47..67d7ffb 100644 --- a/readme.md +++ b/readme.md @@ -56,7 +56,7 @@ from various contexts of CA, CI and OCI / OS. | SPCD_URL_DEBIAN | Debian repository URL | https://deb.debian.org | | SPCD_URL_EPEL | EPEL repository URL | https://dl.fedoraproject.org | | SPCD_URL_FEDORA | Fedora repository URL | https://rpmfind.net | -| SPCD_URL_PYTHON | Python repository URL | https://pypi.org/project | +| SPCD_URL_PYTHON | Python repository URL | https://pypi.org/simple | | SPCD_URL_ROCKY | Rocky repository URL | https://dl.rockylinux.org | | SPCD_URL_UBUNTU | Ubuntu repository URL | https://ubuntu.mirrors.ovh.net | diff --git a/spcd.sh b/spcd.sh index ef7fad4..7028392 100644 --- a/spcd.sh +++ b/spcd.sh @@ -7,7 +7,7 @@ [ -n "${SPCD_DNS_1}" ] || SPCD_DNS_1="9.9.9.9" [ -n "${SPCD_GIT_MAIN}" ] || SPCD_GIT_MAIN="spcd" [ -n "${SPCD_GIT_ROOT}" ] || SPCD_GIT_ROOT="rwx" -[ -n "${SPCD_URL_PYTHON}" ] || SPCD_URL_PYTHON="https://pypi.org/project" +[ -n "${SPCD_URL_PYTHON}" ] || SPCD_URL_PYTHON="https://pypi.org/simple" # main spcd_main() { From c6798f7035f561bfed517aeecda606d11685168c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 7 Aug 2024 13:10:09 +0200 Subject: [PATCH 3/3] rename venv variable --- spcd.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spcd.sh b/spcd.sh index 7028392..f247c80 100644 --- a/spcd.sh +++ b/spcd.sh @@ -704,9 +704,9 @@ spcd_install_packages() { index-url = ${SPCD_URL_PYTHON} " spcd_split - "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_VENV}" + "${SPCD_PYTHON_ALIAS}" -m "venv" "${SPCD_PYTHON_VENV}" spcd_split - . "${SPCD_VENV}/bin/activate" + . "${SPCD_PYTHON_VENV}/bin/activate" spcd_split pip install --upgrade "pip" spcd_split @@ -719,7 +719,8 @@ index-url = ${SPCD_URL_PYTHON} spcd_install_python_modules() { spcd_step "Install Python modules" spcd_ipm__root="$(mktemp --directory)" || exit - spcd_ipm__target="${SPCD_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages" + spcd_ipm__target="\ +${SPCD_PYTHON_VENV}/lib/${SPCD_PYTHON_COMMAND}/site-packages" echo "→ ${spcd_ipm__root}" for spcd_ipm__repository in "${SPCD_GIT_MAIN}" "${SPCD_GIT_ROOT}"; do case "${spcd_ipm__repository}" in @@ -948,7 +949,7 @@ SPCD_PM_APT="apt" SPCD_PM_DNF="dnf" SPCD_PM_PACMAN="pacman" -SPCD_VENV="/opt/venv" +SPCD_PYTHON_VENV="/opt/venv" SPCD_HORIZONTAL="────╌╌╌╌┄┄┄┄┈┈┈┈"