From 1217bf8115edd86ef5fec288268f21289a3ae6b2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 17:16:17 +0200 Subject: [PATCH 01/10] venvs/create --- re.sh | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/re.sh b/re.sh index ba00941..0f483a1 100755 --- a/re.sh +++ b/re.sh @@ -107,6 +107,14 @@ venvs() { for version in "${@}"; do venv="${root}/${version}" case "${action}" in + "create") + export UV_PYTHON_INSTALL_DIR="${venv}/cpypy" + echo "→ install python ${version}" + uv_python "${venv}" "${version}" + echo "→ create venv ${version}" + uv_venv "${venv}" "${version}" + unset UV_PYTHON_INSTALL_DIR + ;; *) ;; esac done @@ -123,17 +131,7 @@ list_venv "${os}" pip_install --upgrade "pip" pip_install "uv" list_venv "${os}" - -for version in "${@}"; do - py="${root}/${version}" - export UV_PYTHON_INSTALL_DIR="${py}/cpypy" - echo "→ install python ${version}" - uv_python "${py}" "${version}" - echo "→ create venv ${version}" - uv_venv "${py}" "${version}" - unset UV_PYTHON_INSTALL_DIR -done - +venvs create deactivate for version in "${@}"; do From e3051799b0a14d8dafe0b5c80116f9d6eafef2c7 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 17:19:15 +0200 Subject: [PATCH 02/10] venvs/uv --- re.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/re.sh b/re.sh index 0f483a1..087f7ca 100755 --- a/re.sh +++ b/re.sh @@ -115,6 +115,13 @@ venvs() { uv_venv "${venv}" "${version}" unset UV_PYTHON_INSTALL_DIR ;; + "uv") + activate "${venv}" + list_venv "${venv}" + pip_install "uv" + list_venv "${venv}" + deactivate + ;; *) ;; esac done @@ -134,14 +141,7 @@ list_venv "${os}" venvs create deactivate -for version in "${@}"; do - py="${root}/${version}" - activate "${py}" - list_venv "${py}" - pip_install "uv" - list_venv "${py}" - deactivate -done +venvs uv for version in "${@}"; do py="${root}/${version}" activate "${py}" From b0a3ae00eb6707c12a4b0bc098a7ca006f8c0cd7 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 17:23:06 +0200 Subject: [PATCH 03/10] venvs/install --- re.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/re.sh b/re.sh index 087f7ca..ad3e15a 100755 --- a/re.sh +++ b/re.sh @@ -115,11 +115,14 @@ venvs() { uv_venv "${venv}" "${version}" unset UV_PYTHON_INSTALL_DIR ;; - "uv") + "init") activate "${venv}" - list_venv "${venv}" pip_install "uv" - list_venv "${venv}" + deactivate + ;; + "install") + activate "${venv}" + uv_install deactivate ;; *) ;; @@ -141,11 +144,10 @@ list_venv "${os}" venvs create deactivate -venvs uv +venvs init for version in "${@}"; do py="${root}/${version}" activate "${py}" - uv_install for module in "rwx"; do ln --symbolic \ "/rwx/rwx/${module}" \ From 44a925feb48c1a178311476a3f4e81c8396d3cb6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 17:26:02 +0200 Subject: [PATCH 04/10] venvs/link --- re.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/re.sh b/re.sh index ad3e15a..c094f2a 100755 --- a/re.sh +++ b/re.sh @@ -125,6 +125,15 @@ venvs() { uv_install deactivate ;; + "link") + activate "${venv}" + for module in "rwx"; do + ln --symbolic \ + "/rwx/rwx/${module}" \ + "${venv}/lib/python${version}/site-packages/${module}" + done + deactivate + ;; *) ;; esac done @@ -148,11 +157,6 @@ venvs init for version in "${@}"; do py="${root}/${version}" activate "${py}" - for module in "rwx"; do - ln --symbolic \ - "/rwx/rwx/${module}" \ - "${py}/lib/python${version}/site-packages/${module}" - done list_venv "${py}" deactivate done From 1a78ce53e7060a1880f17b2d86f4fe12570ed294 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 17:28:16 +0200 Subject: [PATCH 05/10] venvs/list --- re.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/re.sh b/re.sh index c094f2a..d89a031 100755 --- a/re.sh +++ b/re.sh @@ -134,6 +134,11 @@ venvs() { done deactivate ;; + "list") + activate "${venv}" + list_venv "${venv}" + deactivate + ;; *) ;; esac done @@ -154,11 +159,8 @@ venvs create deactivate venvs init -for version in "${@}"; do - py="${root}/${version}" - activate "${py}" - list_venv "${py}" - deactivate -done +venvs link +venvs install +venvs list caches list_venv From 8d978b6cee95e3daf5de0eb7566e426f234cd43a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 17:31:06 +0200 Subject: [PATCH 06/10] venv/action --- re.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/re.sh b/re.sh index d89a031..698e810 100755 --- a/re.sh +++ b/re.sh @@ -106,6 +106,8 @@ venvs() { "3.10" for version in "${@}"; do venv="${root}/${version}" + echo + echo "${venv} ← ${action}" case "${action}" in "create") export UV_PYTHON_INSTALL_DIR="${venv}/cpypy" From 323a1df906b06409afc63c5353f384f38722991d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 19:11:10 +0200 Subject: [PATCH 07/10] url_pypi --- re.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/re.sh b/re.sh index 698e810..b1b1f0c 100755 --- a/re.sh +++ b/re.sh @@ -2,7 +2,7 @@ root="/prj/venv" url="http://localhost:8000" -url_pypi="${url}/pypi/simple" +url_pypi="${url}/pypi/3.12/simple" activate() { echo @@ -105,6 +105,7 @@ venvs() { "3.11" \ "3.10" for version in "${@}"; do + url_pypi="${url}/pypi/${version}/simple" venv="${root}/${version}" echo echo "${venv} ← ${action}" From 8e69d784fceb8e1a70ec4f1b5ef855d9144ab07a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 20:17:19 +0200 Subject: [PATCH 08/10] os --- re.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/re.sh b/re.sh index b1b1f0c..9308616 100755 --- a/re.sh +++ b/re.sh @@ -2,7 +2,7 @@ root="/prj/venv" url="http://localhost:8000" -url_pypi="${url}/pypi/3.12/simple" +url_pypi="${url}/pypi/os/simple" activate() { echo From 23e3475c91a0655d3cda84bf306e95a66a506550 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 20:49:09 +0200 Subject: [PATCH 09/10] venvs/relate --- re.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/re.sh b/re.sh index 9308616..c3536e3 100755 --- a/re.sh +++ b/re.sh @@ -142,6 +142,12 @@ venvs() { list_venv "${venv}" deactivate ;; + "relate") + absolute="$(readlink -f "${venv}/bin/python")" + prevenv="$(readlink -f "${venv}")" + relative=$(echo "${absolute}" | sed "s|${prevenv}|..|") + echo ln --force --symbolic "${relative}" "${venv}/bin/python" + ;; *) ;; esac done @@ -162,6 +168,7 @@ venvs create deactivate venvs init +venvs relate venvs link venvs install venvs list From f64ebcd0f14af1b298f7e6dbc1c24794bae1ccbb Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 20:53:02 +0200 Subject: [PATCH 10/10] fix --- re.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/re.sh b/re.sh index c3536e3..b20ba22 100755 --- a/re.sh +++ b/re.sh @@ -146,7 +146,7 @@ venvs() { absolute="$(readlink -f "${venv}/bin/python")" prevenv="$(readlink -f "${venv}")" relative=$(echo "${absolute}" | sed "s|${prevenv}|..|") - echo ln --force --symbolic "${relative}" "${venv}/bin/python" + ln --force --symbolic "${relative}" "${venv}/bin/python" ;; *) ;; esac