From b5e4bb62972849acfbf89b0d59062b06ec68dc8e Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 24 Dec 2023 13:09:37 +0100 Subject: [PATCH] feat: add CPython 3.13 `--disable-gil` build --- docker/Dockerfile | 5 +++++ tests/run_tests.sh | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2f8c551f..555d1fc6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -141,6 +141,10 @@ FROM build_cpython AS build_cpython313 COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0b1 +FROM build_cpython AS build_cpython313_nogil +COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt +RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0b1 nogil + FROM runtime_base COPY --from=build_git /manylinux-rootfs / @@ -154,6 +158,7 @@ RUN --mount=type=bind,target=/build_cpython36,from=build_cpython36 \ --mount=type=bind,target=/build_cpython311,from=build_cpython311 \ --mount=type=bind,target=/build_cpython312,from=build_cpython312 \ --mount=type=bind,target=/build_cpython313,from=build_cpython313 \ + --mount=type=bind,target=/build_cpython313_nogil,from=build_cpython313_nogil \ mkdir -p /opt/_internal && \ cp -rf /build_cpython*/opt/_internal/* /opt/_internal/ && \ manylinux-entrypoint /opt/_internal/build_scripts/finalize.sh \ diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 63596221..663bcfa3 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -18,15 +18,15 @@ else fi if [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then - EXPECTED_PYTHON_COUNT=8 - EXPECTED_PYTHON_COUNT_ALL=8 + EXPECTED_PYTHON_COUNT=9 + EXPECTED_PYTHON_COUNT_ALL=9 else if [ "${AUDITWHEEL_ARCH}" == "x86_64" ] || [ "${AUDITWHEEL_ARCH}" == "i686" ] || [ "${AUDITWHEEL_ARCH}" == "aarch64" ]; then - EXPECTED_PYTHON_COUNT=12 - EXPECTED_PYTHON_COUNT_ALL=12 + EXPECTED_PYTHON_COUNT=13 + EXPECTED_PYTHON_COUNT_ALL=13 else - EXPECTED_PYTHON_COUNT=8 - EXPECTED_PYTHON_COUNT_ALL=8 + EXPECTED_PYTHON_COUNT=9 + EXPECTED_PYTHON_COUNT_ALL=9 fi fi PYTHON_COUNT=$(manylinux-interpreters list --installed | wc -l)