Teach use-python-version.py about other architectures

Author: bsiegel

.azure-pipelines/install_python_version.py

@@ -80,35 +80,35 @@ def install_selected_python_version(installer_url, installer_folder):
             exit(1)
 
 
-def get_installer_url(requested_version, version_manifest):
+def get_installer_url(requested_version, requested_arch, version_manifest):
     current_plat = platform.system().lower()
 
     print("Current Platform Is {}".format(platform.platform()))
 
     if version_manifest[requested_version]:
         found_installers = version_manifest[requested_version]["files"]
 
-        # filter anything that's not x64. we don't care.
-        x64_installers = [
-            file_def for file_def in found_installers if file_def["arch"] == "x64"
+        # filter anything that's not our requested architecture.
+        arch_installers = [
+            file_def for file_def in found_installers if file_def["arch"] == requested_arch
         ]
 
         if current_plat == "windows":
             return [
                 installer
-                for installer in x64_installers
+                for installer in arch_installers
                 if installer["platform"] == "win32"
             ][0]
         elif current_plat == "darwin":
             return [
                 installer
-                for installer in x64_installers
+                for installer in arch_installers
                 if installer["platform"] == current_plat
             ][0]
         else:
             return [
                 installer
-                for installer in x64_installers
+                for installer in arch_installers
                 if installer["platform"] == "linux"
                 and installer["platform_version"] == CURRENT_UBUNTU_VERSION
             ][0]
@@ -125,6 +125,13 @@ def get_installer_url(requested_version, version_manifest):
         help=("The version specifier passed in to the UsePythonVersion extended task."),
     )
 
+    parser.add_argument(
+        "--arch",
+        dest="arch",
+        default="x64",
+        help=("The architecture passed in to the UsePythonVersion extended task."),
+    )
+
     parser.add_argument(
         "--installer_folder",
         dest="installer_folder",
@@ -152,7 +159,7 @@ def get_installer_url(requested_version, version_manifest):
                 args.version_spec
             )
         )
-        install_file_details = get_installer_url(args.version_spec, version_dict)
+        install_file_details = get_installer_url(args.version_spec, args.arch, version_dict)
         install_selected_python_version(
             install_file_details["download_url"], args.installer_folder
-        )
+        )

.azure-pipelines/use-python-version.yml

@@ -17,7 +17,7 @@ steps:
     displayName: 'Check Version Spec Against Known Versions'
     inputs:
      scriptPath: '.azure-pipelines/install_python_version.py'
-     arguments: '${{ parameters.versionSpec }} --installer_folder="../_pyinstaller'
+     arguments: '${{ parameters.versionSpec }} --arch ${{ parameters.architecture }} --installer_folder="../_pyinstaller'
 
   # use
   - task: UsePythonVersion@0