Merge branch 'main' of https://github.com/mhammond/pywin32 into Native-ARM64-CI-wheels

Author: Avasam

.github/workflows/docs.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: "3.9"
 
       # We still need to install pywin32 because
       # AutoDuck/py2d.py currently relies on runtime imports for introspection
@@ -57,17 +57,15 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: documentation
-
-      - name: Unpack archive
-        run: python -m zipfile -e site.zip .
+          path: site
 
       - uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: site
           commit_message: ${{ github.event.head_commit.message }}
-        # Write .nojekyll at the root, see:
-        # https://help.github.com/en/github/working-with-github-pages/about-github-pages#static-site-generators
+          # Write .nojekyll at the root, see:
+          # https://help.github.com/en/github/working-with-github-pages/about-github-pages#static-site-generators
           enable_jekyll: false
-        # Only deploy if there were changes
+          # Only deploy if there were changes
           allow_empty_commit: false

.github/workflows/main.yml

@@ -2,6 +2,8 @@ name: CI
 
 on:
   push:
+    branches:
+      - main
   pull_request:
     branches:
       - main
@@ -18,7 +20,7 @@ jobs:
   test:
     name: Build and test
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 25
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -48,6 +50,7 @@ jobs:
           cache: pip
           cache-dependency-path: .github/workflows/main.yml
           check-latest: true
+          allow-prereleases: true
 
       - name: Fix user Scripts missing from PATH
         if: matrix.python-architecture == 'x86' || matrix.python-architecture == 'arm64'
@@ -82,9 +85,8 @@ jobs:
         run: python .github\workflows\install-vs-components.py
 
       - name: Build and register the PyCOMTest server dll
-        run: |
-          msbuild com/TestSources/PyCOMTest/PyCOMTest.sln -property:Configuration=Release
-          regsvr32 com/TestSources/PyCOMTest/x64/Release/PyCOMTest.dll
+        # Pass Silent flag to regsvr32 to avoid hanging on confirmation window
+        run: com/TestSources/PyCOMTest/buildAndRegister.bat /s
 
       - name: Run tests
         # Run the tests directly from the source dir so support files (eg, .wav files etc)
@@ -106,7 +108,7 @@ jobs:
   cross_compile_arm64:
     name: Cross-compile ARM64
     runs-on: windows-2022
-    timeout-minutes: 25
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -123,9 +125,10 @@ jobs:
           cache: pip
           cache-dependency-path: .github/workflows/main.yml
           check-latest: true
+          allow-prereleases: true
 
       - name: Install build module
-        run: pip install --upgrade  build
+        run: pip install --upgrade build
 
       - name: Obtain ARM64 library files
         run: python .github\workflows\download-arm64-libs.py ./arm64libs
@@ -156,7 +159,7 @@ jobs:
   # This job can be run locally by running `pre-commit run`
   checkers:
     runs-on: windows-2022
-    timeout-minutes: 25
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -186,13 +189,13 @@ jobs:
           if ($LastExitCode -ne 0) { exit $LastExitCode }
         if: ${{ !cancelled() }}
 
-  mypy:
+  type-checkers:
     runs-on: windows-2022
-    timeout-minutes: 25
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -201,28 +204,14 @@ jobs:
           cache: pip
           cache-dependency-path: .github/workflows/main.yml
           check-latest: true
+          allow-prereleases: true
       - run: pip install types-setuptools PyOpenGL mypy==1.16.*
+
       - run: mypy . --python-version=${{ matrix.python-version }}
 
-  pyright:
-    runs-on: windows-2022
-    timeout-minutes: 25
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: pip
-          cache-dependency-path: .github/workflows/main.yml
-          check-latest: true
-      # pyright vendors typeshed, but let's make sure we have the most up to date stubs
-      - run: pip install types-setuptools PyOpenGL
       - uses: jakebailey/pyright-action@v2
         with:
           python-version: ${{ matrix.python-version }}
-          version: "1.1.396"
+          version: "1.1.401"
           annotate: errors
+        if: ${{ !cancelled() }} # Show issues even if the previous steps failed. But still fail the job

com/TestSources/PyCOMTest/buildAndRegister.bat

@@ -0,0 +1,2 @@
+msbuild %~dp0\PyCOMTest.sln -property:Configuration=Release
+regsvr32 %~dp0\x64\Release\PyCOMTest.dll %*

com/win32com/test/readme.txt

@@ -13,6 +13,7 @@ In general, this should just run the best it can, utilizing what is available
 on the machine.  It is likely some tests will refuse to run due to objects not
 being locally available - this is normal.
 
-The win32com source tree has source code to a C++ and VB component used purely
+The `com/TestSources/` directory has source code to a C++ and VB component used purely
 for testing.  You may like to build and register these, particularly if you
 are doing anything related to argument/result handling.
+You can run `com/TestSources/PyCOMTest/buildAndRegister.bat` directly.

com/win32com/test/testPyComTest.py

@@ -17,6 +17,7 @@
 import win32timezone
 import winerror
 from win32api import CloseHandle, GetCurrentProcessId, OpenProcess
+from win32com import universal
 from win32com.client import (
     VARIANT,
     CastTo,
@@ -29,8 +30,6 @@
 from win32com.universal import RegisterInterfaces
 from win32process import GetProcessMemoryInfo
 
-importMsg = "**** PyCOMTest is not installed ***\n  PyCOMTest is a Python test specific COM client and server.\n  It is likely this server is not installed on this machine\n  To install the server, you must get the win32com sources\n  and build it using MS Visual C++"
-
 # This test uses a Python implemented COM server - ensure correctly registered.
 win32com.test.util.RegisterPythonServer(
     os.path.join(os.path.dirname(__file__), "..", "servers", "test_pycomtest.py"),
@@ -41,10 +40,14 @@
     gencache.EnsureModule(
         "{6BCDCB60-5605-11D0-AE5F-CADD4C000000}", 0, 1, 1, bForDemand=False
     )
-except pythoncom.com_error:
-    print("The PyCOMTest module can not be located or generated.")
-    print(importMsg)
-    raise RuntimeError(importMsg)
+except pythoncom.com_error as error:
+    importMsg = """*** PyCOMTest is not installed ***
+  PyCOMTest is a Python test specific COM client and server.
+  It is likely this server is not installed on this machine
+  To install the server, you must get the win32com sources
+  and build it using MS Visual C++"""
+    print(f"The PyCOMTest module can not be located or generated.\n{importMsg}\n")
+    raise RuntimeError(importMsg) from error
 
 verbose = 0
 
@@ -69,7 +72,7 @@ class TestStruct2(pythoncom.com_record):
     GUID = "{78F0EA07-B7CF-42EA-A251-A4C6269F76AF}"
 
 
-# We don't need to stick with the struct name in the TypeLibrry for the subclass name.
+# We don't need to stick with the struct name in the TypeLibrary for the subclass name.
 # The following class has the same GUID as TestStruct2 from the TypeLibrary.
 class ArrayOfStructsTestStruct(pythoncom.com_record):
     __slots__ = ()