wip

Author: touilleMan

.github/workflows/test.yml

@@ -30,14 +30,13 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Install project & dependencies
+        shell: bash
+        run: pip install .[dev]
+
       - name: Test
         shell: bash
-        run: |
-          set -uexo pipefail
-          python -m venv venv
-          source venv/bin/activate
-          pip install .[dev]
-          pytest ./test
+        run: pytest ./test
 
   test-windows:
     name: Test Windows
@@ -57,8 +56,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Install project & dependencies
+        shell: powershell
+        run: pip install '.[dev]'
+
       - name: Test
         shell: powershell
-        run: |
-          pip install '.[dev]'
-          pytest ./test
+        run: pytest -s ./test

autopxd/__init__.py

@@ -1,9 +1,9 @@
-import json
 import os
 import platform
 import re
 import subprocess
 import sys
+import pathlib
 import tempfile
 from importlib.metadata import (
     version as get_version,
@@ -52,24 +52,40 @@ def _find_cl():
         "ARM64": "arm64",
     }.get(platform.machine(), "x86")
     program_files = os.getenv("ProgramFiles(x86)") or os.getenv("ProgramFiles")
+
     cmd = [
         os.path.join(program_files, r"Microsoft Visual Studio\Installer\vswhere.exe"),
         "-prerelease",
         "-latest",
         "-products",
         "*",
-        "-format",
-        "json",
+        "-requires",
+        "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+        "-property",
+        "installationPath",
+        # "-format",
+        # "json",
         "-utf8",
-        "-find",
-        rf"**\bin\Host{host_platform}\{build_platform}\cl.exe",
+        # "-find",
+        # rf"VC\Tools\MSVC\*\bin\Host{host_platform}\{build_platform}\cl.exe",
+        # rf"**\bin\Host{host_platform}\{build_platform}\cl.exe",
     ]
     try:
-        return json.loads(subprocess.check_output(cmd, encoding="utf-8"))[-1]
-    except (OSError, subprocess.CalledProcessError, IndexError) as ex:
+        install_dir = subprocess.check_output(cmd, encoding="utf-8")
+    except subprocess.CalledProcessError as ex:
         raise RuntimeError("No suitable compiler available") from ex
 
 
+    print("in install dir:", list(pathlib.Path(install_dir).iterdir()))
+    try:
+        print("in install dir:", list((pathlib.Path(install_dir) / "VC\Auxiliary\Build").iterdir()))
+    except Exception as exc:
+        print("in install dir:", repr(exc))
+    default_version = (pathlib.Path(install_dir) / "VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt").read_text()
+    print("=========> default version:", default_version)
+
+    return rf"{install_dir}\VC\Tools\MSVC\{default_version}\bin\Host{host_platform}\{build_platform}\cl.exe"
+
 def _preprocess_msvc(code, extra_cpp_args, debug):
     fd, source_file = tempfile.mkstemp(suffix=".c")
     os.close(fd)