From 72c453f7c1af8a55e9afd1b357bc82f0adaa0663 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 22 May 2025 14:27:42 -0400 Subject: [PATCH] manylinux: bump python script version from 3.8 to 3.11 --- Makefile | 6 +++--- common/common.docker | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4a826d6..aabb10a 100644 --- a/Makefile +++ b/Makefile @@ -209,7 +209,7 @@ manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile manylinux2014-x64 manylinux2014-aarch64.test: manylinux2014-aarch64 $(TEST_DOCKER) run $(RM) $(ORG)/manylinux2014-aarch64:latest > $(BIN)/dockcross-manylinux2014-aarch64 \ && chmod +x $(BIN)/dockcross-manylinux2014-aarch64 - $(BIN)/dockcross-manylinux2014-aarch64 -i $(ORG)/manylinux2014-aarch64:latest /opt/python/cp38-cp38/bin/python test/run.py + $(BIN)/dockcross-manylinux2014-aarch64 -i $(ORG)/manylinux2014-aarch64:latest /opt/python/cp311-cp311/bin/python test/run.py # # manylinux_2_28-x64 @@ -269,7 +269,7 @@ manylinux2014-x64: manylinux2014-x64/Dockerfile manylinux2014-x64.test: manylinux2014-x64 $(TEST_DOCKER) run $(RM) $(ORG)/manylinux2014-x64:latest > $(BIN)/dockcross-manylinux2014-x64 \ && chmod +x $(BIN)/dockcross-manylinux2014-x64 - $(BIN)/dockcross-manylinux2014-x64 -i $(ORG)/manylinux2014-x64:latest /opt/python/cp38-cp38/bin/python test/run.py + $(BIN)/dockcross-manylinux2014-x64 -i $(ORG)/manylinux2014-x64:latest /opt/python/cp311-cp311/bin/python test/run.py # # manylinux2014-x86 @@ -289,7 +289,7 @@ manylinux2014-x86: manylinux2014-x86/Dockerfile manylinux2014-x86.test: manylinux2014-x86 $(TEST_DOCKER) run $(RM) $(ORG)/manylinux2014-x86:latest > $(BIN)/dockcross-manylinux2014-x86 \ && chmod +x $(BIN)/dockcross-manylinux2014-x86 - $(BIN)/dockcross-manylinux2014-x86 -i $(ORG)/manylinux2014-x86:latest /opt/python/cp38-cp38/bin/python test/run.py + $(BIN)/dockcross-manylinux2014-x86 -i $(ORG)/manylinux2014-x86:latest /opt/python/cp311-cp311/bin/python test/run.py # # base-$(HOST_ARCH) diff --git a/common/common.docker b/common/common.docker index cf93550..2163cb0 100644 --- a/common/common.docker +++ b/common/common.docker @@ -43,7 +43,7 @@ RUN \ /buildscripts/build-and-install-cmake.sh $X86_FLAG && \ /buildscripts/build-and-install-rustup.sh && \ /buildscripts/install-liquidprompt-binary.sh && \ - PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \ + PYTHON=$([ -e /opt/python/cp311-cp311/bin/python ] && echo "/opt/python/cp311-cp311/bin/python" || echo "python3") && \ /buildscripts/install-python-packages.sh -python ${PYTHON} && \ /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \ /buildscripts/build-and-install-flatcc.sh && \