Add Architecture-Specific PATH Management for Python with --user Flag on Windows for x86

.github/workflows/e2e-tests.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Verify 3.9.13
         run: python __tests__/verify-python.py 3.9.13
 
-      - name: Run with setup-python 3.9.13
+      - name: Run with setup-python 3.10.11
         uses: ./
         with:
           python-version: 3.10.11
@@ -89,7 +89,34 @@ jobs:
           python-version: '<3.13'
       - name: Verify <3.13
         run: python __tests__/verify-python.py 3.12
+
       - name: Test Raw Endpoint Access
         run: |
           curl -L https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json | jq empty
         shell: bash
+
+  verify-install-path:
+    name: Verify Install Path
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, windows-11-arm]
+        architecture: [x64, x86, arm64]
+        freethreaded: ['false', 'true']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13.1']
+        exclude:
+          - architecture: x64
+            freethreaded: 'true'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: ./
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: ${{ matrix.architecture }}
+          freethreaded: ${{ matrix.freethreaded }}
+
+      - name: Verify Install Path
+        run: python __tests__/verify_windows_install_path.ps1 ${{ matrix.architecture }} ${{ matrix.freethreaded }} ${{ matrix.python-version }}

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

@@ -24,7 +24,6 @@ jobs:
           [
             macos-latest,
             windows-latest,
-            ubuntu-20.04,
             ubuntu-22.04,
             ubuntu-22.04-arm,
             macos-13,
@@ -62,7 +61,6 @@ jobs:
           [
             macos-latest,
             windows-latest,
-            ubuntu-20.04,
             ubuntu-22.04,
             ubuntu-22.04-arm,
             macos-13,
@@ -103,7 +101,6 @@ jobs:
           [
             macos-latest,
             windows-latest,
-            ubuntu-20.04,
             ubuntu-22.04,
             ubuntu-22.04-arm,
             macos-13,
@@ -142,7 +139,6 @@ jobs:
           [
             macos-latest,
             windows-latest,
-            ubuntu-20.04,
             ubuntu-22.04,
             ubuntu-22.04-arm,
             macos-13,
@@ -184,7 +180,6 @@ jobs:
           [
             macos-latest,
             windows-latest,
-            ubuntu-20.04,
             ubuntu-22.04,
             ubuntu-22.04-arm,
             macos-13,
@@ -226,7 +221,6 @@ jobs:
           [
             macos-latest,
             windows-latest,
-            ubuntu-20.04,
             ubuntu-22.04,
             ubuntu-22.04-arm,
             macos-13,
@@ -258,7 +252,6 @@ jobs:
           [
             macos-latest,
             windows-latest,
-            ubuntu-20.04,
             ubuntu-22.04,
             ubuntu-22.04-arm,
             macos-13,
@@ -371,7 +364,6 @@ jobs:
           [
             macos-latest,
             windows-latest,
-            ubuntu-20.04,
             ubuntu-22.04,
             ubuntu-22.04-arm,
             macos-13,
@@ -461,7 +453,6 @@ jobs:
           [
             macos-latest,
             windows-latest,
-            ubuntu-20.04,
             ubuntu-22.04,
             ubuntu-22.04-arm,
             macos-13,

__tests__/verify-windows-install-path.ps1

@@ -0,0 +1,43 @@
+import os
+import sys
+
+def build_expected_path(architecture, freethreaded):
+    major = 3
+    minor = 13
+    version_suffix = f"{major}{minor}"
+
+    if architecture == "x86" and (major > 3 or (major == 3 and minor >= 10)):
+        version_suffix += "-32"
+    elif architecture == "arm64":
+        version_suffix += "-arm64"
+
+    if freethreaded == "true":
+        version_suffix += "t"
+        if architecture == "x86":
+            version_suffix += "-32"
+        elif architecture == "arm64":
+            version_suffix += "-arm64"
+
+    base_path = os.getenv("APPDATA", "")
+    return os.path.join(base_path, "Python", f"Python{version_suffix}", "Scripts")
+
+def main():
+    if len(sys.argv) != 3:
+        print("Usage: python verify_windows_install_path.py <architecture> <freethreaded>")
+        sys.exit(1)
+
+    architecture = sys.argv[1]
+    freethreaded = sys.argv[2]
+
+    expected_path = build_expected_path(architecture, freethreaded)
+    print(f"Expected PATH entry: {expected_path}")
+
+    path_env = os.getenv("PATH", "")
+    if expected_path.lower() not in path_env.lower():
+        print("Expected path not found in PATH")
+        sys.exit(1)
+    else:
+        print("Correct path present in PATH")
+
+if __name__ == "__main__":
+    main()

dist/setup/index.js

@@ -96883,13 +96883,32 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
             core.addPath(installDir);
             core.addPath(_binDir);
             if (utils_1.IS_WINDOWS) {
-                // Add --user directory
-                // `installDir` from tool cache should look like $RUNNER_TOOL_CACHE/Python/<semantic version>/x64/
-                // So if `findLocalTool` succeeded above, we must have a conformant `installDir`
+                // Extract version details
                 const version = path.basename(path.dirname(installDir));
                 const major = semver.major(version);
                 const minor = semver.minor(version);
-                const userScriptsDir = path.join(process.env['APPDATA'] || '', 'Python', `Python${major}${minor}`, 'Scripts');
+                const basePath = process.env['APPDATA'] || '';
+                let versionSuffix = `${major}${minor}`;
+                // Append '-32' for x86 architecture if Python version is >= 3.10
+                if (architecture === 'x86' &&
+                    (major > 3 || (major === 3 && minor >= 10))) {
+                    versionSuffix += '-32';
+                }
+                else if (architecture === 'arm64') {
+                    versionSuffix += '-arm64';
+                }
+                // Append 't' for freethreaded builds
+                if (freethreaded) {
+                    versionSuffix += 't';
+                    if (architecture === 'x86-freethreaded') {
+                        versionSuffix += '-32';
+                    }
+                    else if (architecture === 'arm64-freethreaded') {
+                        versionSuffix += '-arm64';
+                    }
+                }
+                // Add user Scripts path
+                const userScriptsDir = path.join(basePath, 'Python', `Python${versionSuffix}`, 'Scripts');
                 core.addPath(userScriptsDir);
             }
             // On Linux and macOS, pip will create the --user directory and add it to PATH as needed.

src/find-python.ts

@@ -49,8 +49,8 @@ export async function useCpythonVersion(
     // Use the freethreaded version if it was specified in the input, e.g., 3.13t
     freethreaded = true;
   }
-  core.debug(`Semantic version spec of ${version} is ${semanticVersionSpec}`);
 
+  core.debug(`Semantic version spec of ${version} is ${semanticVersionSpec}`);
   if (freethreaded) {
     // Free threaded versions use an architecture suffix like `x64-freethreaded`
     core.debug(`Using freethreaded version of ${semanticVersionSpec}`);
@@ -152,17 +152,36 @@ export async function useCpythonVersion(
     core.addPath(_binDir);
 
     if (IS_WINDOWS) {
-      // Add --user directory
-      // `installDir` from tool cache should look like $RUNNER_TOOL_CACHE/Python/<semantic version>/x64/
-      // So if `findLocalTool` succeeded above, we must have a conformant `installDir`
+      // Extract version details
       const version = path.basename(path.dirname(installDir));
       const major = semver.major(version);
       const minor = semver.minor(version);
 
+      const basePath = process.env['APPDATA'] || '';
+      let versionSuffix = `${major}${minor}`;
+      // Append '-32' for x86 architecture if Python version is >= 3.10
+      if (
+        architecture === 'x86' &&
+        (major > 3 || (major === 3 && minor >= 10))
+      ) {
+        versionSuffix += '-32';
+      } else if (architecture === 'arm64') {
+        versionSuffix += '-arm64';
+      }
+      // Append 't' for freethreaded builds
+      if (freethreaded) {
+        versionSuffix += 't';
+        if (architecture === 'x86-freethreaded') {
+          versionSuffix += '-32';
+        } else if (architecture === 'arm64-freethreaded') {
+          versionSuffix += '-arm64';
+        }
+      }
+      // Add user Scripts path
       const userScriptsDir = path.join(
-        process.env['APPDATA'] || '',
+        basePath,
         'Python',
-        `Python${major}${minor}`,
+        `Python${versionSuffix}`,
         'Scripts'
       );
       core.addPath(userScriptsDir);