From fdc01a98b62127b900a5903cae926425d62db45f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 21:34:47 +0200 Subject: [PATCH 01/10] no-dl --- re.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/re.sh b/re.sh index b20ba22..5083585 100755 --- a/re.sh +++ b/re.sh @@ -92,6 +92,7 @@ uv_venv() { uv venv \ --allow-existing \ --index-url "${url_pypi}" \ + --no-python-downloads \ --python "${2}" \ --relocatable \ --seed \ @@ -103,7 +104,8 @@ venvs() { set \ "3.12" \ "3.11" \ - "3.10" + "3.10" \ + "pypy3.10" for version in "${@}"; do url_pypi="${url}/pypi/${version}/simple" venv="${root}/${version}" From 925cbbdeca87051fc0e7306122d08d8ea3dfd558 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 21:41:09 +0200 Subject: [PATCH 02/10] pypy --- re.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/re.sh b/re.sh index 5083585..8527930 100755 --- a/re.sh +++ b/re.sh @@ -84,8 +84,11 @@ set \ uv_python() { echo export UV_PYTHON_INSTALL_MIRROR="${url}/cpypy" - uv python install "${2}" - unset UV_PYTHON_INSTALL_MIRROR + export UV_PYPY_INSTALL_MIRROR="${UV_PYTHON_INSTALL_MIRROR}" + uv python install "${1}" + unset \ + UV_PYPY_INSTALL_MIRROR \ + UV_PYTHON_INSTALL_MIRROR } uv_venv() { echo @@ -115,7 +118,7 @@ venvs() { "create") export UV_PYTHON_INSTALL_DIR="${venv}/cpypy" echo "→ install python ${version}" - uv_python "${venv}" "${version}" + uv_python "${version}" echo "→ create venv ${version}" uv_venv "${venv}" "${version}" unset UV_PYTHON_INSTALL_DIR From e576cf24ee5485937dff89ac7233536ae30fc9f6 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 29 Sep 2024 22:06:17 +0200 Subject: [PATCH 03/10] /pypy --- re.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/re.sh b/re.sh index 8527930..f5845d6 100755 --- a/re.sh +++ b/re.sh @@ -84,7 +84,7 @@ set \ uv_python() { echo export UV_PYTHON_INSTALL_MIRROR="${url}/cpypy" - export UV_PYPY_INSTALL_MIRROR="${UV_PYTHON_INSTALL_MIRROR}" + export UV_PYPY_INSTALL_MIRROR="${UV_PYTHON_INSTALL_MIRROR}/pypy" uv python install "${1}" unset \ UV_PYPY_INSTALL_MIRROR \ From af9448da3a080e0a779471f1876f0b383a6521c4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 30 Sep 2024 08:33:52 +0200 Subject: [PATCH 04/10] merged --- re.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/re.sh b/re.sh index f5845d6..1cf316a 100755 --- a/re.sh +++ b/re.sh @@ -110,7 +110,7 @@ venvs() { "3.10" \ "pypy3.10" for version in "${@}"; do - url_pypi="${url}/pypi/${version}/simple" + url_pypi="${url}/pypi/simple" venv="${root}/${version}" echo echo "${venv} ← ${action}" From 263a2db4a90329d2c2f19acce500f65af51522e3 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 30 Sep 2024 08:41:08 +0200 Subject: [PATCH 05/10] url_pypi --- re.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/re.sh b/re.sh index 1cf316a..bf75267 100755 --- a/re.sh +++ b/re.sh @@ -2,7 +2,7 @@ root="/prj/venv" url="http://localhost:8000" -url_pypi="${url}/pypi/os/simple" +url_pypi="${url}/pypi/simple" activate() { echo @@ -110,7 +110,6 @@ venvs() { "3.10" \ "pypy3.10" for version in "${@}"; do - url_pypi="${url}/pypi/simple" venv="${root}/${version}" echo echo "${venv} ← ${action}" From e71fc92be57fff5ccb240f37fbd1ac5be125cea9 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 30 Sep 2024 10:09:04 +0200 Subject: [PATCH 06/10] bin/python --- re.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/re.sh b/re.sh index bf75267..f9c322f 100755 --- a/re.sh +++ b/re.sh @@ -39,7 +39,7 @@ list() { ls -a -l "${1}/${2}" } list_venv() { - list "${1}" "bin" + list "${1}" "bin/python" } pip_install() { echo From 46d7b287a6d27a2ca0d981d9c5afa79d581bf98d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 30 Sep 2024 10:13:07 +0200 Subject: [PATCH 07/10] versions --- re.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/re.sh b/re.sh index f9c322f..a706ab9 100755 --- a/re.sh +++ b/re.sh @@ -105,9 +105,9 @@ venvs() { local action="${1}" local venv version set \ - "3.12" \ - "3.11" \ - "3.10" \ + "python3.12" \ + "python3.11" \ + "python3.10" \ "pypy3.10" for version in "${@}"; do venv="${root}/${version}" @@ -137,7 +137,7 @@ venvs() { for module in "rwx"; do ln --symbolic \ "/rwx/rwx/${module}" \ - "${venv}/lib/python${version}/site-packages/${module}" + "${venv}/lib/${version}/site-packages/${module}" done deactivate ;; From 295c9c67f24b86040a025ad07c31383e63c5f5cf Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 30 Sep 2024 10:16:02 +0200 Subject: [PATCH 08/10] lib/rwx --- re.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/re.sh b/re.sh index a706ab9..a0d3246 100755 --- a/re.sh +++ b/re.sh @@ -40,6 +40,7 @@ list() { } list_venv() { list "${1}" "bin/python" + list "${1}" "lib/$(basename "${1}")/site-packages/rwx" } pip_install() { echo From e0059fb8c562678ce0eb99ffc7ca3b2b5d44915b Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 30 Sep 2024 10:19:24 +0200 Subject: [PATCH 09/10] fix --- re.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/re.sh b/re.sh index a0d3246..23bcc84 100755 --- a/re.sh +++ b/re.sh @@ -178,4 +178,4 @@ venvs link venvs install venvs list -caches list_venv +caches list From 2172ff104c17f464eb4392da9dd75d1b16ff7a4d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Oct 2024 22:15:52 +0200 Subject: [PATCH 10/10] 3.13 --- re.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/re.sh b/re.sh index 23bcc84..10acf27 100755 --- a/re.sh +++ b/re.sh @@ -106,6 +106,7 @@ venvs() { local action="${1}" local venv version set \ + "python3.13" \ "python3.12" \ "python3.11" \ "python3.10" \