Merge branch 'main' into multidim_safearray

Author: geppi

.github/workflows/main.yml

@@ -12,10 +12,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-env:
-  # We can't yet run tests with PYTHONDEVMODE=1, let's at least show warnings
-  PYTHONWARNINGS: always
-
 jobs:
   test:
     name: Build and test
@@ -26,6 +22,13 @@ jobs:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
         architecture: [x64, x86]
+    env:
+      # TODO: We can't yet run tests with PYTHONDEVMODE=1, let's emulated it as much as we can
+      # https://docs.python.org/3/library/devmode.html#effects-of-the-python-development-mode
+      PYTHONMALLOC: debug
+      PYTHONASYNCIODEBUG: 1
+      PYTHONWARNINGS: always
+      # PYTHONFAULTHANDLER: 1 # This causes our tests to fail
 
     steps:
       - uses: actions/checkout@v4

CHANGES.md

@@ -19,6 +19,7 @@ Coming in build 312, as yet unreleased
 --------------------------------------
 
 * Implement multidimensional SAFEARRAY(COM Record) and SAFEARRAY(double) (mhammond#2655, [@geppi][geppi])
+* Fixed missing version stamp on built `.dll` and `.exe` files (mhammond#2647, [@Avasam][Avasam])
 * Removed considerations for Windows 95/98/ME (mhammond#2400, [@Avasam][Avasam])
   This removes the following constants:
   * `win32con.FILE_ATTRIBUTE_ATOMIC_WRITE`

setup.py

@@ -378,8 +378,8 @@ def run(self):
 
 
 class my_build_ext(build_ext):
-    def finalize_options(self):
-        build_ext.finalize_options(self)
+    def finalize_options(self) -> None:
+        super().finalize_options()
 
         self.plat_dir = {
             "win-amd64": "x64",
@@ -393,8 +393,9 @@ def finalize_options(self):
         if self.mingw32:
             self.libraries.append("stdc++")
 
-        self.excluded_extensions = []  # list of (ext, why)
-        self.swig_cpp = True  # hrm - deprecated - should use swig_opts=-c++??
+        self.excluded_extensions: list[tuple[WinExt, str]] = []
+        """List of excluded extensions and their reason"""
+        self.swig_opts.append("-c++")
 
     def _why_cant_build_extension(self, ext):
         """Return None, or a reason it can't be built."""
@@ -539,6 +540,25 @@ def _check_vc(self):
                 print("-- ATLMFC paths likely missing (Required for win32ui)")
         return vcbase, vcverdir
 
+    def _verstamp(self, filename):
+        """
+        Stamp the version of the built target.
+        Do this externally to avoid suddenly dragging in the
+        modules needed by this process.
+        """
+        self.spawn(
+            [
+                sys.executable,
+                Path(__file__).parent / "win32" / "Lib" / "win32verstamp.py",
+                f"--version={pywin32_version}",
+                "--comments=https://github.com/mhammond/pywin32",
+                f"--original-filename={os.path.basename(filename)}",
+                "--product=PyWin32",
+                "--quiet" if "-v" not in sys.argv else "",
+                filename,
+            ]
+        )
+
     def build_extensions(self):
         # First, sanity-check the 'extensions' list
         self.check_extensions_list(self.extensions)
@@ -598,24 +618,6 @@ def build_extensions(self):
             print("-- compiler.library_dirs:", self.compiler.library_dirs)
             raise RuntimeError("Too many extensions skipped, check build environment")
 
-        for ext in [*self.extensions, *W32_exe_files]:
-            # Stamp the version of the built target.
-            # Do this externally to avoid suddenly dragging in the
-            # modules needed by this process, and which we will soon try and update.
-            ext_path = self.get_ext_fullpath(ext.name)
-            self.spawn(
-                [
-                    sys.executable,
-                    Path(__file__).parent / "win32" / "Lib" / "win32verstamp.py",
-                    f"--version={pywin32_version}",
-                    "--comments=https://github.com/mhammond/pywin32",
-                    f"--original-filename={os.path.basename(ext_path)}",
-                    "--product=PyWin32",
-                    "--quiet" if "-v" not in sys.argv else "",
-                    ext_path,
-                ]
-            )
-
         # Not sure how to make this completely generic, and there is no
         # need at this stage.
         self._build_scintilla()
@@ -701,6 +703,8 @@ def build_exefile(self, ext):
             build_temp=self.build_temp,
         )
 
+        self._verstamp(full_name)
+
     def build_extension(self, ext):
         # Some of these extensions are difficult to build, requiring various
         # hard-to-track libraries et (eg, exchange sdk, etc).  So we
@@ -741,6 +745,7 @@ def build_extension(self, ext):
 
         try:
             build_ext.build_extension(self, ext)
+            self._verstamp(self.get_ext_fullpath(ext.name))
             # Convincing distutils to create .lib files with the name we
             # need is difficult, so we just hack around it by copying from
             # the created name to the name we need.
@@ -890,8 +895,9 @@ def swig_sources(self, sources, ext=None):
 
 
 class my_compiler(MSVCCompiler):
-    # Work around bpo-36302/bpo-42009 - it sorts sources but this breaks
-    # support for building .mc files etc :(
+    # Work around python/cpython#80483 / python/cpython#86175
+    # it sorts sources but this breaks support for building .mc files etc :(
+    # See pypa/setuptools#4986 / pypa/distutils#370 for potential upstream fix.
     def compile(self, sources, **kwargs):
         # re-sort the list of source files but ensure all .mc files come first.
         def key_reverse_mc(a):