Update macos-pkg-setup-template.sh

.github/workflows/build-python-packages.yml

@@ -12,11 +12,6 @@ on:
         required: true
         type: boolean
         default: false
-      THREADING_BUILD_MODES:
-        description: 'CPython threading build modes'
-        required: true
-        type: string
-        default: 'default,freethreaded'
       PLATFORMS:
         description: 'Platforms for execution in "os" or "os_arch" format (arch is "x64" by default)'
         required: true
@@ -45,11 +40,9 @@ jobs:
         id: generate-matrix
         run: |
           [String[]]$configurations = "${{ inputs.platforms || 'ubuntu-20.04,ubuntu-22.04,ubuntu-22.04_arm64,ubuntu-24.04,ubuntu-24.04_arm64,macos-13,macos-14_arm64,windows-2019_x64,windows-2019_x86,windows-2019_arm64' }}".Split(",").Trim()
-          [String[]]$buildModes = "${{ inputs.threading_build_modes || 'default' }}".Split(",").Trim()
           $matrix = @()
           
           foreach ($configuration in $configurations) {
-            foreach ($buildMode in $buildModes) {
             $parts = $configuration.Split("_")
             $os = $parts[0]
             $arch = if ($parts[1]) {$parts[1]} else {"x64"}
@@ -69,20 +62,12 @@ jobs:
               $os = "setup-actions-windows-arm64-4-core"
             }
             
-              if ($buildMode -eq "freethreaded") {
-                if ([semver]"${{ inputs.VERSION }}" -lt [semver]"3.13.0") {
-                  continue;
-                }
-                $arch += "-freethreaded"
-              }
-
             $matrix += @{
               'platform' = $platform
               'os' = $os
               'arch' = $arch
             }
           }
-          }
           echo "matrix=$($matrix | ConvertTo-Json -Compress -AsArray)" >> $env:GITHUB_OUTPUT
           
   build_python:
@@ -124,10 +109,6 @@ jobs:
         with:
           submodules: true
 
-      - name: Adding Symlink
-        if: matrix.os == 'macos-13'
-        run: ln -sf /usr/local/opt/tcl-tk@8 /usr/local/opt/tcl-tk
-
       - name: Build Python ${{ env.VERSION }}
         run: |
           ./builders/build-python.ps1 -Version $env:VERSION `
@@ -220,9 +201,6 @@ jobs:
           python-version: ${{ env.VERSION }}
           architecture: ${{ matrix.arch }}
 
-      - name: Python version
-        run: python -VVV
-
       - name: Verbose sysconfig dump
         if: runner.os == 'Linux' || runner.os == 'macOS'
         run: python ./sources/python-config-output.py

.github/workflows/releases-validation.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04, macos-13, ubuntu-latest]
+        os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04, macos-13]
         python: [3.9.13, 3.10.11, 3.11.8, 3.12.7, 3.13.0]
     steps:
     - name: setup-python ${{ matrix.python }}

.github/workflows/test-python-version.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04, ubuntu-latest, macos-13] 
+        os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04] 
     steps:
     - name: Setup Python ${{ github.event.inputs.version }}
       uses: actions/setup-python@main

builders/macos-python-builder.psm1

@@ -6,18 +6,17 @@ class macOSPythonBuilder : NixPythonBuilder {
     MacOS Python builder class.
 
     .DESCRIPTION
-    Contains methods that required to build macOS Python artifact from sources. Inherited from base NixPythonBuilder.
+    Contains methods required to build macOS Python artifacts from sources. Inherited from base NixPythonBuilder.
 
     While python.org provides precompiled binaries for macOS, switching to them risks breaking existing customers.
     If we wanted to start using the official binaries instead of building from source, we should avoid changing previous versions
     so we remain backwards compatible.
 
     .PARAMETER platform
-    The full name of platform for which Python should be built.
+    The full name of the platform for which Python should be built.
 
     .PARAMETER version
     The version of Python that should be built.
-
     #>
 
     macOSPythonBuilder(
@@ -32,12 +31,16 @@ class macOSPythonBuilder : NixPythonBuilder {
         Prepare system environment by installing dependencies and required packages.
         #>
 
+        # Only for Python 3.7.17, install additional dependencies
     if ($this.Version -eq "3.7.17") {
-            # We have preinstalled ncurses and readLine on the hoster runners. But we need to install bzip2 for 
+        Write-Host "Installing additional dependencies for Python 3.7.17..."
-            # setting up an environemnt 
+        # Install necessary dependencies for Python 3.7.17
-            # If we get any issues realted to ncurses or readline we can try to run this command
+        Execute-Command -Command "brew install bzip2 zlib readline ncurses sqlite3 openssl@3"
-            # brew install ncurses readline
+
-            Execute-Command -Command "brew install bzip2"
+        # Ensure the environment variables for zlib are set correctly
+        $zlibPrefix = (brew --prefix zlib)
+        $env:LDFLAGS += " -L$($zlibPrefix)/lib"
+        $env:CFLAGS += " -I$($zlibPrefix)/include"
     }
     }
 
@@ -71,20 +74,22 @@ class macOSPythonBuilder : NixPythonBuilder {
             $env:LDFLAGS = "-L/usr/local/opt/openssl@3/lib -L/usr/local/opt/zlib/lib"
             $env:CFLAGS = "-I/usr/local/opt/openssl@3/include -I/usr/local/opt/zlib/include"
         } else {
-            $configureString += " --with-openssl=/usr/local/opt/openssl@3"
+            $configureString += " --with-openssl=/usr/local/opt/openssl@1.1"  # For Python 3.7.x, use OpenSSL 1.1
 
-            # For Python 3.7.2 and 3.7.3 we need to provide PATH for zlib to pack it properly. Otherwise the build will fail
+            # For Python 3.7.2, 3.7.3, and 3.7.17 we need to provide PATH for zlib to pack it properly.
-            # with the error: zipimport.ZipImportError: can't decompress data; zlib not available
+            # Otherwise, the build will fail with the error: zipimport.ZipImportError: can't decompress data; zlib not available
             if ($this.Version -eq "3.7.2" -or $this.Version -eq "3.7.3" -or $this.Version -eq "3.7.17") {
                 $env:LDFLAGS = "-L/usr/local/opt/zlib/lib"
                 $env:CFLAGS = "-I/usr/local/opt/zlib/include"
             }
 
-            # if ($this.Version -gt "3.7.12") {
+            if ($this.Version -gt "3.7.12") {
-                $configureString += " --with-tcltk-includes='-I /usr/local/opt/tcl-tk/include/tcl-tk' --with-tcltk-libs='-L/usr/local/opt/tcl-tk/lib -ltcl8.6 -ltk8.6'"
+                $configureString += " --with-tcltk-includes='-I /usr/local/opt/tcl-tk/include' --with-tcltk-libs='-L/usr/local/opt/tcl-tk/lib -ltcl8.6 -ltk8.6'"
-            # }
+            }
 
+            # Specific for Python 3.7.17
             if ($this.Version -eq "3.7.17") {
+                Write-Host "Setting environment for Python 3.7.17..."
                 $env:LDFLAGS += " -L$(brew --prefix bzip2)/lib -L$(brew --prefix readline)/lib -L$(brew --prefix ncurses)/lib"
                 $env:CFLAGS += " -I$(brew --prefix bzip2)/include -I$(brew --prefix readline)/include -I$(brew --prefix ncurses)/include"
             }
@@ -151,37 +156,6 @@ class macOSPythonBuilder : NixPythonBuilder {
         return $pkgLocation
     }
 
-    [string] GetFrameworkName() {
-        <#
-        .SYNOPSIS
-        Get the Python installation Package name.
-        #>
-
-        if ($this.IsFreeThreaded()) {
-            return "PythonT.framework"
-        } else {
-            return "Python.framework"
-        }
-    }
-
-    [string] GetPkgChoices() {
-        <#
-        .SYNOPSIS
-        Reads the configuration XML file for the Python installer
-        #>
-
-        $config = if ($this.IsFreeThreaded()) { "freethreaded" } else { "default" }
-        $choicesFile = Join-Path $PSScriptRoot "../config/macos-pkg-choices-$($config).xml"
-        $choicesTemplate = Get-Content -Path $choicesFile -Raw
-
-        $variablesToReplace = @{
-            "{{__VERSION_MAJOR_MINOR__}}" = "$($this.Version.Major).$($this.Version.Minor)";
-        }
-
-        $variablesToReplace.keys | ForEach-Object { $choicesTemplate = $choicesTemplate.Replace($_, $variablesToReplace[$_]) }
-        return $choicesTemplate
-    }
-
     [void] CreateInstallationScriptPkg() {
         <#
         .SYNOPSIS
@@ -196,8 +170,6 @@ class macOSPythonBuilder : NixPythonBuilder {
             "{{__VERSION_FULL__}}" = $this.Version;
             "{{__PKG_NAME__}}" = $this.GetPkgName();
             "{{__ARCH__}}" = $this.Architecture;
-            "{{__FRAMEWORK_NAME__}}" = $this.GetFrameworkName();
-            "{{__PKG_CHOICES__}}" = $this.GetPkgChoices();
         }
 
         $variablesToReplace.keys | ForEach-Object { $installationTemplateContent = $installationTemplateContent.Replace($_, $variablesToReplace[$_]) }

builders/python-builder.psm1

@@ -94,24 +94,6 @@ class PythonBuilder {
         return "$($this.Version.Major).$($this.Version.Minor).$($this.Version.Patch)"
     }
 
-    [string] GetHardwareArchitecture() {
-        <#
-        .SYNOPSIS
-        The hardware architecture (x64, arm64) without any Python free threading suffix.
-        #>
-
-        return $this.Architecture.Replace("-freethreaded", "")
-    }
-
-    [bool] IsFreeThreaded() {
-        <#
-        .SYNOPSIS
-        Check if Python version is free threaded.
-        #>
-
-        return $this.Architecture.EndsWith("-freethreaded")
-    }
-
     [void] PreparePythonToolcacheLocation() {
         <#
         .SYNOPSIS

builders/ubuntu-python-builder.psm1

@@ -37,14 +37,6 @@ class UbuntuPythonBuilder : NixPythonBuilder {
         $configureString += " --enable-shared"
         $configureString += " --enable-optimizations"
 
-        if ($this.IsFreeThreaded()) {
-            if ($this.Version -lt "3.13.0") {
-                Write-Host "Python versions lower than 3.13.0 do not support free threading"
-                exit 1
-            }
-            $configureString += " --disable-gil"
-        }
-
         ### Compile with support of loadable sqlite extensions.
         ### Link to documentation (https://docs.python.org/3/library/sqlite3.html#sqlite3.Connection.enable_load_extension)
         $configureString += " --enable-loadable-sqlite-extensions"

builders/win-python-builder.psm1

@@ -54,13 +54,13 @@ class WinPythonBuilder : PythonBuilder {
         #>
 
         $ArchitectureExtension = ""
-        if ($this.GetHardwareArchitecture() -eq "x64") {
+        if ($this.Architecture -eq "x64") {
             if ($this.Version -ge "3.5") {
                 $ArchitectureExtension = "-amd64"
             } else {
                 $ArchitectureExtension = ".amd64"
             }
-        } elseif ($this.GetHardwareArchitecture() -eq "arm64") {
+        }elseif ($this.Architecture -eq "arm64") {
                 $ArchitectureExtension = "-arm64"
         }
 
@@ -113,7 +113,6 @@ class WinPythonBuilder : PythonBuilder {
 
         $variablesToReplace = @{
             "{{__ARCHITECTURE__}}" = $this.Architecture;
-            "{{__HARDWARE_ARCHITECTURE__}}" = $this.GetHardwareArchitecture();
             "{{__VERSION__}}" = $this.Version;
             "{{__PYTHON_EXEC_NAME__}}" = $pythonExecName
         }

config/macos-pkg-choices-default.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<array>
-    <dict>
-   </dict>
-</array>
-</plist>

config/macos-pkg-choices-freethreaded.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<array>
-    <dict>
-        <key>attributeSetting</key>
-        <integer>1</integer>
-        <key>choiceAttribute</key>
-        <string>selected</string>
-        <key>choiceIdentifier</key>
-        <string>org.python.Python.PythonTFramework-{{__VERSION_MAJOR_MINOR__}}</string>
-    </dict>
-</array>
-</plist>

config/python-manifest-config.json

@@ -1,5 +1,5 @@
 {
-    "regex": "python-\\d+\\.\\d+\\.\\d+-(\\w+\\.\\d+)?-?(\\w+)-(\\d+\\.\\d+)?-?((x|arm)\\d+(-freethreaded)?)",
+    "regex": "python-\\d+\\.\\d+\\.\\d+-(\\w+\\.\\d+)?-?(\\w+)-(\\d+\\.\\d+)?-?((x|arm)\\d+)",
     "groups": {
         "arch": 4,
         "platform": 2,

installers/macos-pkg-setup-template.sh

@@ -2,11 +2,6 @@ set -e
 
 PYTHON_FULL_VERSION="{{__VERSION_FULL__}}"
 PYTHON_PKG_NAME="{{__PKG_NAME__}}"
-PYTHON_FRAMEWORK_NAME="{{__FRAMEWORK_NAME__}}"
-PYTHON_PKG_CHOICES=$(cat << 'EOF'
-{{__PKG_CHOICES__}}
-EOF
-)
 ARCH="{{__ARCH__}}"
 MAJOR_VERSION=$(echo $PYTHON_FULL_VERSION | cut -d '.' -f 1)
 MINOR_VERSION=$(echo $PYTHON_FULL_VERSION | cut -d '.' -f 2)
@@ -25,15 +20,37 @@ fi
 PYTHON_TOOLCACHE_PATH=$TOOLCACHE_ROOT/Python
 PYTHON_TOOLCACHE_VERSION_PATH=$PYTHON_TOOLCACHE_PATH/$PYTHON_FULL_VERSION
 PYTHON_TOOLCACHE_VERSION_ARCH_PATH=$PYTHON_TOOLCACHE_VERSION_PATH/$ARCH
-PYTHON_FRAMEWORK_PATH="/Library/Frameworks/${PYTHON_FRAMEWORK_NAME}/Versions/${MAJOR_VERSION}.${MINOR_VERSION}"
+PYTHON_FRAMEWORK_PATH="/Library/Frameworks/Python.framework/Versions/${MAJOR_VERSION}.${MINOR_VERSION}"
 PYTHON_APPLICATION_PATH="/Applications/Python ${MAJOR_VERSION}.${MINOR_VERSION}"
 
-echo "Check if Python hostedtoolcache folder exist..."
+# Check if zlib is installed
+echo "Checking if zlib is installed..."
+if ! brew list zlib &>/dev/null; then
+    echo "Installing zlib via brew..."
+    brew install zlib
+else
+    echo "zlib already installed."
+fi
+
+# Only for Python 3.7.17, install additional dependencies like zlib and others
+if [ "$MAJOR_VERSION" -eq 3 ] && [ "$MINOR_VERSION" -eq 7 ] && [ "$PYTHON_FULL_VERSION" == "3.7.17" ]; then
+    echo "Installing additional dependencies for Python 3.7.17..."
+    brew install bzip2 readline ncurses sqlite3 openssl@3
+    # Ensure the environment variables for zlib are set correctly
+    ZLIB_PREFIX=$(brew --prefix zlib)
+    export LDFLAGS="-L${ZLIB_PREFIX}/lib"
+    export CFLAGS="-I${ZLIB_PREFIX}/include"
+    export CPPFLAGS="-I${ZLIB_PREFIX}/include"
+    echo "zlib linked at ${ZLIB_PREFIX}/lib"
+fi
+
+# Check if Python hostedtoolcache folder exists...
+echo "Check if Python hostedtoolcache folder exists..."
 if [ ! -d $PYTHON_TOOLCACHE_PATH ]; then
     echo "Creating Python hostedtoolcache folder..."
     mkdir -p $PYTHON_TOOLCACHE_PATH
 else
-    # remove ALL other directories for same major.minor python versions
+    # Remove ALL other directories for same major.minor python versions
     find $PYTHON_TOOLCACHE_PATH -name "${MAJOR_VERSION}.${MINOR_VERSION}.*" | while read python_version; do
         python_version_arch="$python_version/$ARCH"
         if [ -e "$python_version_arch" ]; then
@@ -43,13 +60,10 @@ else
     done
 fi
 
-PYTHON_PKG_CHOICES_FILES=$(mktemp)
+echo "Installing Python binaries from prebuilt package"
-echo "$PYTHON_PKG_CHOICES" > $PYTHON_PKG_CHOICES_FILES
+sudo installer -pkg $PYTHON_PKG_NAME -target /
 
-echo "Install Python binaries from prebuilt package"
+echo "Creating hostedtoolcache symlinks (Required for the backward compatibility)"
-sudo installer -pkg $PYTHON_PKG_NAME -applyChoiceChangesXML $PYTHON_PKG_CHOICES_FILES -target /
-
-echo "Create hostedtoolcach symlinks (Required for the backward compatibility)"
 echo "Create Python $PYTHON_FULL_VERSION folder"
 mkdir -p $PYTHON_TOOLCACHE_VERSION_ARCH_PATH
 cd $PYTHON_TOOLCACHE_VERSION_ARCH_PATH
@@ -59,11 +73,9 @@ ln -s "${PYTHON_FRAMEWORK_PATH}/include" include
 ln -s "${PYTHON_FRAMEWORK_PATH}/share" share
 ln -s "${PYTHON_FRAMEWORK_PATH}/lib" lib
 
-echo "Create additional symlinks (Required for the UsePythonVersion Azure Pipelines task and the setup-python GitHub Action)"
+echo "Creating additional symlinks (Required for the UsePythonVersion Azure Pipelines task and the setup-python GitHub Action)"
 ln -s ./bin/$PYTHON_MAJOR_DOT_MINOR python
-chmod +x python
 
-# Note that bin is a symlink so referencing .. from bin will not work as expected
 cd bin/
 
 # This symlink already exists if Python version with the same major.minor version is installed,
@@ -72,23 +84,19 @@ if [ ! -f $PYTHON_MAJOR_MINOR ]; then
     ln -s $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJOR_MINOR
 fi
 
-if [ ! -f $PYTHON_MAJOR ]; then
-    ln -s $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJOR
-fi
-
 if [ ! -f python ]; then
     ln -s $PYTHON_MAJOR_DOT_MINOR python
 fi
 
-chmod +x $PYTHON_MAJOR $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJOR_MINOR python
+chmod +x ../python $PYTHON_MAJOR $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJOR_MINOR python
 
 echo "Upgrading pip..."
 export PIP_ROOT_USER_ACTION=ignore
 ./python -m ensurepip
 ./python -m pip install --upgrade --force-reinstall pip --disable-pip-version-check --no-warn-script-location
 
-echo "Install OpenSSL certificates"
+echo "Installing OpenSSL certificates"
 sh -e "${PYTHON_APPLICATION_PATH}/Install Certificates.command"
 
-echo "Create complete file"
+echo "Creating complete file"
 touch $PYTHON_TOOLCACHE_VERSION_PATH/${ARCH}.complete

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_ARCH_PATH ]; then
+elif [ -d $PYTHON_TOOLCACHE_VERSION_PATH ]; then
-    echo "Deleting Python $PYTHON_FULL_VERSION ($ARCH)"
+    echo "Deleting Python $PYTHON_FULL_VERSION"
-    rm -rf $PYTHON_TOOLCACHE_VERSION_ARCH_PATH
+    rm -rf $PYTHON_TOOLCACHE_VERSION_PATH
 fi
 
 echo "Create Python $PYTHON_FULL_VERSION folder"

installers/win-setup-template.ps1

@@ -1,5 +1,4 @@
 [String] $Architecture = "{{__ARCHITECTURE__}}"
-[String] $HardwareArchitecture = "{{__HARDWARE_ARCHITECTURE__}}"
 [String] $Version = "{{__VERSION__}}"
 [String] $PythonExecName = "{{__PYTHON_EXEC_NAME__}}"
 
@@ -26,7 +25,7 @@ function Remove-RegistryEntries {
         [Parameter(Mandatory)][Int32] $MinorVersion
     )
 
-    $versionFilter = Get-RegistryVersionFilter -Architecture $HardwareArchitecture -MajorVersion $MajorVersion -MinorVersion $MinorVersion
+    $versionFilter = Get-RegistryVersionFilter -Architecture $Architecture -MajorVersion $MajorVersion -MinorVersion $MinorVersion
 
     $regPath = "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products"
     if (Test-Path -Path Registry::$regPath) {
@@ -62,15 +61,13 @@ function Remove-RegistryEntries {
 function Get-ExecParams {
     param(
         [Parameter(Mandatory)][Boolean] $IsMSI,
-        [Parameter(Mandatory)][Boolean] $IsFreeThreaded,
         [Parameter(Mandatory)][String] $PythonArchPath
     )
 
     if ($IsMSI) {
         "TARGETDIR=$PythonArchPath ALLUSERS=1"
     } else {
-        $Include_freethreaded = if ($IsFreeThreaded) { "Include_freethreaded=1" } else { "" }
+        "DefaultAllUsersTargetDir=$PythonArchPath InstallAllUsers=1"
-        "DefaultAllUsersTargetDir=$PythonArchPath InstallAllUsers=1 $Include_freethreaded"
     }
 }
 
@@ -84,7 +81,6 @@ $PythonVersionPath = Join-Path -Path $PythonToolcachePath -ChildPath $Version
 $PythonArchPath = Join-Path -Path $PythonVersionPath -ChildPath $Architecture
 
 $IsMSI = $PythonExecName -match "msi"
-$IsFreeThreaded = $Architecture -match "-freethreaded"
 
 $MajorVersion = $Version.Split('.')[0]
 $MinorVersion = $Version.Split('.')[1]
@@ -124,24 +120,13 @@ Write-Host "Copy Python binaries to $PythonArchPath"
 Copy-Item -Path ./$PythonExecName -Destination $PythonArchPath | Out-Null
 
 Write-Host "Install Python $Version in $PythonToolcachePath..."
-$ExecParams = Get-ExecParams -IsMSI $IsMSI -IsFreeThreaded $IsFreeThreaded -PythonArchPath $PythonArchPath
+$ExecParams = Get-ExecParams -IsMSI $IsMSI -PythonArchPath $PythonArchPath
 
 cmd.exe /c "cd $PythonArchPath && call $PythonExecName $ExecParams /quiet"
 if ($LASTEXITCODE -ne 0) {
     Throw "Error happened during Python installation"
 }
 
-# print out all files in $PythonArchPath
-Write-Host "Files in $PythonArchPath"
-$files = Get-ChildItem -Path $PythonArchPath -File -Recurse
-Write-Output $files
-
-if ($IsFreeThreaded) {
-    # Delete python.exe and create a symlink to free-threaded exe
-    Remove-Item -Path "$PythonArchPath\python.exe" -Force
-    New-Item -Path "$PythonArchPath\python.exe" -ItemType SymbolicLink -Value "$PythonArchPath\python${MajorVersion}.${MinorVersion}t.exe"
-}
-
 Write-Host "Create `python3` symlink"
 if ($MajorVersion -ne "2") {
     New-Item -Path "$PythonArchPath\python3.exe" -ItemType SymbolicLink -Value "$PythonArchPath\python.exe"

tests/python-tests.ps1

@@ -7,8 +7,6 @@ param (
     $Architecture
 )
 
-$HardwareArchitecture = $Architecture -replace "-freethreaded", ""
-
 Import-Module (Join-Path $PSScriptRoot "../helpers/pester-extensions.psm1")
 Import-Module (Join-Path $PSScriptRoot "../helpers/common-helpers.psm1")
 Import-Module (Join-Path $PSScriptRoot "../builders/python-version.psm1")
@@ -60,7 +58,7 @@ Describe "Tests" {
     #     }
     # }
 
-    if (($Version -ge "3.2.0") -and ($Version -lt "3.11.0") -and (($Platform -ne "darwin") -or ($HardwareArchitecture -ne "arm64"))) {
+    if (($Version -ge "3.2.0") -and ($Version -lt "3.11.0") -and (($Platform -ne "darwin") -or ($Architecture -ne "arm64"))) {
         It "Check if sqlite3 module is installed" {
             "python ./sources/python-sqlite3.py" | Should -ReturnZeroExitCode
         }

tests/sources/python-config-test.py

@@ -8,31 +8,25 @@ os_type = platform.system()
 version = sys.argv[1]
 nativeVersion = sys.argv[2]
 architecture = sys.argv[3]
-hw_architecture = architecture.replace('-freethreaded', '')
 
 versions=version.split(".")
 version_major=int(versions[0])
 version_minor=int(versions[1])
 
-pkg_installer = os_type == 'Darwin' and ((version_major == 3 and version_minor >= 11) or (hw_architecture == "arm64"))
+pkg_installer = os_type == 'Darwin' and ((version_major == 3 and version_minor >= 11) or (architecture == "arm64"))
 
 lib_dir_path = sysconfig.get_config_var('LIBDIR')
 ld_library_name = sysconfig.get_config_var('LDLIBRARY')
 
 is_shared = sysconfig.get_config_var('Py_ENABLE_SHARED')
 have_libreadline = sysconfig.get_config_var("HAVE_LIBREADLINE")
-is_free_threaded = sysconfig.get_config_var('Py_GIL_DISABLED')
 
 ### Define expected variables
 if os_type == 'Linux': expected_ld_library_extension = 'so'
 if os_type == 'Darwin': expected_ld_library_extension = 'dylib'
-if is_free_threaded:
-    framework_name = 'PythonT.framework'
-else:
-    framework_name = 'Python.framework'
 
 if pkg_installer:
-    expected_lib_dir_path = f'/Library/Frameworks/{framework_name}/Versions/{version_major}.{version_minor}/lib'
+    expected_lib_dir_path = f'/Library/Frameworks/Python.framework/Versions/{version_major}.{version_minor}/lib'
 else:
     expected_lib_dir_path = f'{os.getenv("AGENT_TOOLSDIRECTORY")}/Python/{version}/{architecture}/lib'