From 414a6832681e3079a21ed038c761173369a11e4d Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 13 Aug 2023 22:07:33 +0200 Subject: [PATCH] feature: add GraalPy --- docker/build_scripts/manylinux-interpreters.py | 8 ++++++++ docker/build_scripts/python_versions.json | 12 ++++++++++++ tests/run_tests.sh | 5 ++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/docker/build_scripts/manylinux-interpreters.py b/docker/build_scripts/manylinux-interpreters.py index 00236a42..e33b1e62 100644 --- a/docker/build_scripts/manylinux-interpreters.py +++ b/docker/build_scripts/manylinux-interpreters.py @@ -21,6 +21,8 @@ def sort_key(tag): python_tag, _ = tag.split("-") if python_tag.startswith(("cp", "pp")): return python_tag[:2], int(python_tag[2]), int(python_tag[3:]) + if python_tag.startswith("graalpy"): + return python_tag[:7], int(python_tag[7]), int(python_tag[8:]) raise LookupError(tag) @@ -83,6 +85,12 @@ def get_info_from_tag(tag): "i": "pypy", "iv": PYTHON_TAGS[tag][ARCH]["version"] } + if python_tag.startswith("graalpy"): + return { + "pv": f"{python_tag[7]}.{python_tag[8:]}", + "i": "graalpy", + "iv": PYTHON_TAGS[tag][ARCH]["version"] + } raise LookupError(tag) diff --git a/docker/build_scripts/python_versions.json b/docker/build_scripts/python_versions.json index dee55804..43e67f17 100644 --- a/docker/build_scripts/python_versions.json +++ b/docker/build_scripts/python_versions.json @@ -1,4 +1,16 @@ { + "graalpy310-graalpy230_310_native": { + "x86_64": { + "version": "23.0.0", + "download_url": "https://github.com/oracle/graalpython/releases/download/graal-23.0.0/graalpython-23.0.0-linux-amd64.tar.gz", + "sha256": "25e4fa7c1d45db6dcac5bfa4d1a0aa9ef5581623dc5903ce98d246c5d394639c" + }, + "aarch64": { + "version": "23.0.0", + "download_url": "https://github.com/oracle/graalpython/releases/download/graal-23.0.0/graalpython-23.0.0-linux-aarch64.tar.gz", + "sha256": "e2a00b2b6485282b4a04aa382e30d696e00d20eb2fe1736debbe2d9df2a8737a" + } + }, "pp37-pypy37_pp73": { "x86_64": { "version": "7.3.9", diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 32cac0cb..84d87b57 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -21,7 +21,10 @@ if [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then EXPECTED_PYTHON_COUNT=7 EXPECTED_PYTHON_COUNT_ALL=7 else - if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] || [ "${AUDITWHEEL_ARCH}" == "i686" ] || [ "${AUDITWHEEL_ARCH}" == "aarch64" ]; then + if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] || [ "${AUDITWHEEL_ARCH}" == "aarch64" ]; then + EXPECTED_PYTHON_COUNT=11 + EXPECTED_PYTHON_COUNT_ALL=12 + elif [ "${AUDITWHEEL_ARCH}" == "i686" ]; then EXPECTED_PYTHON_COUNT=11 EXPECTED_PYTHON_COUNT_ALL=11 else