From 8c714c46832530ef7e4c97b6d84eb04563fd5314 Mon Sep 17 00:00:00 2001 From: Sam Gross Date: Wed, 22 Jan 2025 18:59:28 +0000 Subject: [PATCH 1/2] Use type 'string' instead of 'str' --- .github/workflows/build-python-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-python-packages.yml b/.github/workflows/build-python-packages.yml index 802038c11..91b7eaacf 100644 --- a/.github/workflows/build-python-packages.yml +++ b/.github/workflows/build-python-packages.yml @@ -15,7 +15,7 @@ on: THREADING_BUILD_MODES: description: 'CPython threading build modes' required: true - type: str + type: string default: 'freethreaded' PLATFORMS: description: 'Platforms for execution in "os" or "os_arch" format (arch is "x64" by default)' From 796f49b6d36a235e0d9c48f4da3dcbc37d91bbe9 Mon Sep 17 00:00:00 2001 From: Sam Gross Date: Wed, 22 Jan 2025 20:58:51 +0000 Subject: [PATCH 2/2] On Linux, only delete Python installations with the same architecture. This matches the macOS behavior and allows users to install both the free-threading and default builds at the same time. --- installers/nix-setup-template.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installers/nix-setup-template.sh b/installers/nix-setup-template.sh index f67c2dcc8..d452ca3fe 100644 --- a/installers/nix-setup-template.sh +++ b/installers/nix-setup-template.sh @@ -24,9 +24,9 @@ echo "Check if Python hostedtoolcache folder exist..." if [ ! -d $PYTHON_TOOLCACHE_PATH ]; then echo "Creating Python hostedtoolcache folder..." mkdir -p $PYTHON_TOOLCACHE_PATH -elif [ -d $PYTHON_TOOLCACHE_VERSION_PATH ]; then - echo "Deleting Python $PYTHON_FULL_VERSION" - rm -rf $PYTHON_TOOLCACHE_VERSION_PATH +elif [ -d $PYTHON_TOOLCACHE_VERSION_ARCH_PATH ]; then + echo "Deleting Python $PYTHON_FULL_VERSION ($ARCH)" + rm -rf $PYTHON_TOOLCACHE_VERSION_ARCH_PATH fi echo "Create Python $PYTHON_FULL_VERSION folder"