diff --git a/__tests__/verify_windows_install_path_user.py b/__tests__/verify_windows_install_path_user.py new file mode 100644 index 00000000..9ee8eb36 --- /dev/null +++ b/__tests__/verify_windows_install_path_user.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 fd3d14a3..491c85a8 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -96171,8 +96171,7 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest 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))) { + if (architecture === 'x86' && (major > 3 || (major === 3 && minor >= 10))) { versionSuffix += '-32'; } else if (architecture === 'arm64') { diff --git a/src/find-python.ts b/src/find-python.ts index 2e317d9c..58ec4347 100644 --- a/src/find-python.ts +++ b/src/find-python.ts @@ -160,10 +160,7 @@ export async function useCpythonVersion( 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)) - ) { + if (architecture === 'x86' && (major > 3 || (major === 3 && minor >= 10))){ versionSuffix += '-32'; } else if (architecture === 'arm64') { versionSuffix += '-arm64';