From b22fe06733b1dbc5003c902a43c53bb362c30c2c Mon Sep 17 00:00:00 2001 From: Aparna Jyothi Date: Fri, 6 Jun 2025 18:24:20 +0530 Subject: [PATCH] logic update --- .github/workflows/e2e-tests.yml | 29 +++++++++++++++- __tests__/verify-windows-install-path.py | 43 ++++++++++++++++++++++++ dist/setup/index.js | 6 ---- src/find-python.ts | 8 +---- 4 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 __tests__/verify-windows-install-path.py diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index fa478ac6..3373b44c 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.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', '3.14'] + 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.py ${{ matrix.architecture }} ${{ matrix.freethreaded }} ${{ matrix.python-version }} diff --git a/__tests__/verify-windows-install-path.py b/__tests__/verify-windows-install-path.py new file mode 100644 index 00000000..9ee8eb36 --- /dev/null +++ b/__tests__/verify-windows-install-path.py @@ -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 ") + 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() \ No newline at end of file diff --git a/dist/setup/index.js b/dist/setup/index.js index bf9c072a..b0c41ae4 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -96817,9 +96817,6 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest // Use the freethreaded version if it was specified in the input, e.g., 3.13t freethreaded = true; } - if (architecture.endsWith('-freethreaded')) { - throw new Error(`Invalid architecture '${architecture}'. Use 'freethreaded' flag in the python-version (e.g., '3.13.1t') or use freethreaded: true instead of specifying '-freethreaded' in the architecture`); - } core.debug(`Semantic version spec of ${version} is ${semanticVersionSpec}`); if (freethreaded) { // Free threaded versions use an architecture suffix like `x64-freethreaded` @@ -96909,9 +96906,6 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest else if (architecture === 'arm64-freethreaded') { versionSuffix += '-arm64'; } - else if (architecture === 'x64-freethreaded') { - versionSuffix += '-64'; - } } // Add user Scripts path const userScriptsDir = path.join(basePath, 'Python', `Python${versionSuffix}`, 'Scripts'); diff --git a/src/find-python.ts b/src/find-python.ts index c6c7b462..2e317d9c 100644 --- a/src/find-python.ts +++ b/src/find-python.ts @@ -49,11 +49,7 @@ export async function useCpythonVersion( // Use the freethreaded version if it was specified in the input, e.g., 3.13t freethreaded = true; } - if (architecture.endsWith('-freethreaded')) { - throw new Error( - `Invalid architecture '${architecture}'. Use 'freethreaded' flag in the python-version (e.g., '3.13.1t') or use freethreaded: true instead of specifying '-freethreaded' in the architecture` - ); - } + core.debug(`Semantic version spec of ${version} is ${semanticVersionSpec}`); if (freethreaded) { // Free threaded versions use an architecture suffix like `x64-freethreaded` @@ -179,8 +175,6 @@ export async function useCpythonVersion( versionSuffix += '-32'; } else if (architecture === 'arm64-freethreaded') { versionSuffix += '-arm64'; - } else if (architecture === 'x64-freethreaded') { - versionSuffix += '-64'; } } // Add user Scripts path