Update build-python-packages.yml

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

@@ -41,7 +41,6 @@ jobs:
         run: |
           [String[]]$configurations = "${{ inputs.platforms || 'ubuntu-20.04,ubuntu-20.04_arm64,ubuntu-22.04,ubuntu-22.04_arm64,ubuntu-24.04,ubuntu-24.04_arm64,macos-11,macos-14_arm64,windows-2019_x64,windows-2019_x86' }}".Split(",").Trim()
           $matrix = @()
-
           foreach ($configuration in $configurations) {
             $parts = $configuration.Split("_")
             $os = $parts[0]
@@ -58,7 +57,6 @@ jobs:
             }
           }
           echo "matrix=$($matrix | ConvertTo-Json -Compress -AsArray)" >> $env:GITHUB_OUTPUT
-
   build_python:
     needs: generate_matrix
     strategy:
@@ -71,6 +69,7 @@ jobs:
     steps:
 
       - name: Install Chocolatey
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: powershell
         run: |
           Set-ExecutionPolicy Bypass -Scope Process -Force
@@ -78,24 +77,28 @@ jobs:
           iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
           echo "C:\ProgramData\Chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
       - name: Install PowerShell
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: cmd
         run: |
           choco install powershell-core -y
       - name: Add PowerShell to PATH
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: powershell
         run: |
           echo "C:\Program Files\PowerShell\7" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
       
       - name: Install Git
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: cmd
         run: |
           choco install git -y
-
       - name: Add Git to PATH
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: powershell
         run: |
           echo "C:\Program Files\Git\cmd" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
       - name: Check git version 
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         run: |
           git --version
           
@@ -105,20 +108,19 @@ jobs:
           submodules: true
 
       - name: Install 7-Zip
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: cmd
         run: |
           choco install 7zip -y
-
       - name: Add 7-Zip to PATH
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: powershell
         run: |
           echo "C:\ProgramData\chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-
       - name: Build Python ${{ env.VERSION }}
         run: |
           ./builders/build-python.ps1 -Version $env:VERSION `
                   -Platform ${{ matrix.platform }} -Architecture ${{ matrix.arch }}
-
       - name: Publish artifact
         uses: actions/upload-artifact@v4
         with:
@@ -138,6 +140,7 @@ jobs:
     steps:
 
       - name: Install Chocolatey
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: powershell
         run: |
           Set-ExecutionPolicy Bypass -Scope Process -Force
@@ -145,24 +148,28 @@ jobs:
           iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
           echo "C:\ProgramData\Chocolatey\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
       - name: Install PowerShell
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: cmd
         run: |
           choco install powershell-core -y
       - name: Add PowerShell to PATH
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: powershell
         run: |
           echo "C:\Program Files\PowerShell\7" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
       
       - name: Install Git
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: cmd
         run: |
           choco install git -y
-
       - name: Add Git to PATH
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: powershell
         run: |
           echo "C:\Program Files\Git\cmd" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
       - name: Check git version 
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         run: |
           git --version
       - name: Check out repository code
@@ -185,10 +192,10 @@ jobs:
           path: ${{ runner.temp }}/${{ env.ARTIFACT_NAME }}
 
       - name: Install 7-Zip
+        if: runner.os == 'Windows' && runner.architecture == 'ARM64'
         shell: cmd
         run: |
           choco install 7zip -y
-
       - name: Add 7-Zip to PATH
         shell: powershell
         run: |
@@ -231,7 +238,6 @@ jobs:
         run: |
           $pythonLocation = which python
           if ('${{ matrix.platform }}' -eq 'darwin') { otool -L $pythonLocation } else { ldd $pythonLocation }
-
       - name: Run tests
         run: |
             Install-Module Pester -Force -Scope CurrentUser -SkipPublisherCheck
@@ -266,7 +272,6 @@ jobs:
           release_name: ${{ env.VERSION }}
           body: |
             Python ${{ env.VERSION }}
-
       - name: Generate hash for packages
         run: |
           $childItems = Get-Childitem -Path '.'
@@ -314,4 +319,3 @@ jobs:
             workflow_id: 'create-pr.yml',
             ref: 'main'
           });
-

builders/nix-python-builder.psm1

@@ -97,7 +97,6 @@ class NixPythonBuilder : PythonBuilder {
 
         $variablesToReplace = @{
             "{{__VERSION_FULL__}}" = $this.Version;
-            "{{__ARCH__}}" = $this.Architecture;
         }
         $variablesToReplace.keys | ForEach-Object { $installationTemplateContent = $installationTemplateContent.Replace($_, $variablesToReplace[$_]) }
 

builders/win-python-builder.psm1

@@ -64,6 +64,7 @@ class WinPythonBuilder : PythonBuilder {
                 $ArchitectureExtension = "-arm64"
         }
 
+
         return $ArchitectureExtension
     }
 

installers/nix-setup-template.sh

@@ -1,7 +1,6 @@
 set -e
 
 PYTHON_FULL_VERSION="{{__VERSION_FULL__}}"
-ARCH="{{__ARCH__}}"
 MAJOR_VERSION=$(echo $PYTHON_FULL_VERSION | cut -d '.' -f 1)
 MINOR_VERSION=$(echo $PYTHON_FULL_VERSION | cut -d '.' -f 2)
 
@@ -18,7 +17,7 @@ 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_TOOLCACHE_VERSION_ARCH_PATH=$PYTHON_TOOLCACHE_VERSION_PATH/x64
 
 echo "Check if Python hostedtoolcache folder exist..."
 if [ ! -d $PYTHON_TOOLCACHE_PATH ]; then
@@ -55,4 +54,4 @@ export PIP_ROOT_USER_ACTION=ignore
 ./python -m pip install --upgrade --force-reinstall pip --disable-pip-version-check --no-warn-script-location
 
 echo "Create complete file"
-touch $PYTHON_TOOLCACHE_VERSION_PATH/$ARCH.complete
+touch $PYTHON_TOOLCACHE_VERSION_PATH/x64.complete

tests/sources/python-config-test.py

@@ -28,7 +28,7 @@ if os_type == 'Darwin': expected_ld_library_extension = 'dylib'
 if pkg_installer:
     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'
+    expected_lib_dir_path = f'{os.getenv("AGENT_TOOLSDIRECTORY")}/Python/{version}/x64/lib'
 
 # Check modules
 ### Validate libraries path

versions-manifest.json

@@ -1,56 +1,4 @@
 [
-  {
-    "version": "3.13.0-beta.2",
-    "stable": false,
-    "release_url": "https://github.com/actions/python-versions/releases/tag/3.13.0-beta.2-9470028175",
-    "files": [
-      {
-        "filename": "python-3.13.0-beta.2-darwin-arm64.tar.gz",
-        "arch": "arm64",
-        "platform": "darwin",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.13.0-beta.2-9470028175/python-3.13.0-beta.2-darwin-arm64.tar.gz"
-      },
-      {
-        "filename": "python-3.13.0-beta.2-darwin-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.13.0-beta.2-9470028175/python-3.13.0-beta.2-darwin-x64.tar.gz"
-      },
-      {
-        "filename": "python-3.13.0-beta.2-linux-20.04-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "platform_version": "20.04",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.13.0-beta.2-9470028175/python-3.13.0-beta.2-linux-20.04-x64.tar.gz"
-      },
-      {
-        "filename": "python-3.13.0-beta.2-linux-22.04-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "platform_version": "22.04",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.13.0-beta.2-9470028175/python-3.13.0-beta.2-linux-22.04-x64.tar.gz"
-      },
-      {
-        "filename": "python-3.13.0-beta.2-linux-24.04-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "platform_version": "24.04",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.13.0-beta.2-9470028175/python-3.13.0-beta.2-linux-24.04-x64.tar.gz"
-      },
-      {
-        "filename": "python-3.13.0-beta.2-win32-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.13.0-beta.2-9470028175/python-3.13.0-beta.2-win32-x64.zip"
-      },
-      {
-        "filename": "python-3.13.0-beta.2-win32-x86.zip",
-        "arch": "x86",
-        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.13.0-beta.2-9470028175/python-3.13.0-beta.2-win32-x86.zip"
-      }
-    ]
-  },
   {
     "version": "3.13.0-beta.1",
     "stable": false,
@@ -373,58 +321,6 @@
       }
     ]
   },
-  {
-    "version": "3.12.4",
-    "stable": true,
-    "release_url": "https://github.com/actions/python-versions/releases/tag/3.12.4-9469551593",
-    "files": [
-      {
-        "filename": "python-3.12.4-darwin-arm64.tar.gz",
-        "arch": "arm64",
-        "platform": "darwin",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.12.4-9469551593/python-3.12.4-darwin-arm64.tar.gz"
-      },
-      {
-        "filename": "python-3.12.4-darwin-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.12.4-9469551593/python-3.12.4-darwin-x64.tar.gz"
-      },
-      {
-        "filename": "python-3.12.4-linux-20.04-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "platform_version": "20.04",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.12.4-9469551593/python-3.12.4-linux-20.04-x64.tar.gz"
-      },
-      {
-        "filename": "python-3.12.4-linux-22.04-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "platform_version": "22.04",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.12.4-9469551593/python-3.12.4-linux-22.04-x64.tar.gz"
-      },
-      {
-        "filename": "python-3.12.4-linux-24.04-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "platform_version": "24.04",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.12.4-9469551593/python-3.12.4-linux-24.04-x64.tar.gz"
-      },
-      {
-        "filename": "python-3.12.4-win32-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.12.4-9469551593/python-3.12.4-win32-x64.zip"
-      },
-      {
-        "filename": "python-3.12.4-win32-x86.zip",
-        "arch": "x86",
-        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.12.4-9469551593/python-3.12.4-win32-x86.zip"
-      }
-    ]
-  },
   {
     "version": "3.12.3",
     "stable": true,