Adding CPU architecture support on windows

tr00st · web-flow · commit b7dc030a4ed0 · 2019-01-24T16:04:32.000Z
Patches lookups via the Windows "py" launcher to also check for architecture when "-32" or "-64" is added to the end of a basepython value.
diff --git a/src/tox/interpreters.py b/src/tox/interpreters.py
@@ -161,13 +161,16 @@ def tox_get_python_executable(envconfig):
                 return actual
         # Use py.exe to determine location - PEP-514 & PEP-397
         if m:
-            return locate_via_py(*groups)
+            archMatch = re.match(r"python(\d)(\.(\d))?(?P<arch>-(32|64))?", envconfig.basepython)
+            arch = archMatch.group('arch')
+            return locate_via_py(*groups, arch=arch)
 
     # Exceptions to the usual windows mapping
     win32map = {"python": sys.executable, "jython": r"c:\jython2.5.1\jython.bat"}
 
-    def locate_via_py(*parts):
-        ver = "-{}".format(".".join(parts))
+    def locate_via_py(*parts, arch=None):
+       
+        ver = "-{}{}".format(".".join(parts),(arch if arch is not None else ""))
         script = "import sys; print(sys.executable)"
         py_exe = distutils.spawn.find_executable("py")
         if py_exe:
