Pypy3

.github/workflows/docs.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.9'
 
@@ -38,7 +38,7 @@ jobs:
     - name: Create archive
       run: python -m zipfile -c site.zip site
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: documentation
         path: site.zip
@@ -52,7 +52,7 @@ jobs:
     if: github.event_name == 'create' && github.event.ref_type == 'tag'
 
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: documentation
 

.github/workflows/download-arm64-libs.py

@@ -21,11 +21,11 @@
 
 VERSION = "{}.{}.{}".format(*sys.version_info[:3])
 if sys.version_info.releaselevel == "alpha":
-    VERSION += "-a{}".format(sys.version_info.serial)
+    VERSION += f"-a{sys.version_info.serial}"
 if sys.version_info.releaselevel == "beta":
-    VERSION += "-b{}".format(sys.version_info.serial)
+    VERSION += f"-b{sys.version_info.serial}"
 if sys.version_info.releaselevel == "candidate":
-    VERSION += "-rc{}".format(sys.version_info.serial)
+    VERSION += f"-rc{sys.version_info.serial}"
 
 URL = f"https://www.nuget.org/api/v2/package/pythonarm64/{VERSION}"
 PATH = dest / f"pythonarm64.{VERSION}.zip"

.github/workflows/main.yml

@@ -2,63 +2,57 @@ name: CI
 
 on:
   push:
-    branches:
-    - main
   pull_request:
     branches:
     - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   test:
+    name: Build and test
     runs-on: windows-2019
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11-dev']
+        # python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12-dev', 'pypy-3.9']
+        python-version: ['pypy-3.9']
         architecture: ['x64', 'x86']
+        exclude:
+        - python-version: 'pypy-3.9'
+          architecture: 'x86'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: ${{ matrix.architecture }}
 
-    - name: Show runner information
+    - name: Setup environment
       run: |
         python --version
         pip --version
+        pip install --upgrade setuptools wheel
 
-    # Need wheel so that we can use bdist_wheel
-    - name: Upgrade Python packaging tools
-      run: pip install --upgrade wheel
-
-    - name: Set Python user directory
-      run: python -c "import os,site;open(os.environ['GITHUB_ENV'], 'a').write('USER_DIR=%s\n' % os.path.dirname(site.USER_SITE).rstrip('-32'))"
-
-    - name: Build package
-      run: python setup.py --skip-verstamp build
-
-    - name: Install package
-      run: python setup.py install --user
+    - name: Build and install
+      run: |
+        python setup.py --skip-verstamp install --user
 
     - name: Run tests
-      run: python ${env:USER_DIR}\Scripts\pywin32_testall.py -v -skip-adodbapi
+      # Run the tests directly from the source dir so support files (eg, .wav files etc)
+      # can be found - they aren't installed into the Python tree.
+      run: python pywin32_testall.py -v -skip-adodbapi
 
     - name: Build wheels
       run: |
         python setup.py bdist_wheel --skip-build
 
-    # 3.10 dropped support for bdist_wininst. If we had both 3.9 and 3.10 available in a single
-    # environment we could also build the .exe for 3.10+ - but for now, we can't.
-    - if: matrix.python-version != '3.10' && matrix.python-version != '3.11-dev'
-      name: Build installers
-      run: |
-        python setup.py bdist_wininst --skip-build --target-version=${{ matrix.python-version }}
-
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: ${{ always() }}
       with:
         name: artifacts
@@ -69,32 +63,27 @@ jobs:
   # We cannot build and test on ARM64, so we cross-compile.
   # Later, when available, we can add tests using this wheel on ARM64 VMs
   build_arm64:
+    name: Cross-compile ARM
     runs-on: windows-2019
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.11-dev']
+        python-version: ['3.10', '3.11', '3.12-dev']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: 'x64'
 
-    - name: Show runner information
+    - name: Setup Environment
       run: |
         python --version
         pip --version
-
-    # Need wheel so that we can use bdist_wheel
-    - name: Upgrade Python packaging tools
-      run: pip install --upgrade setuptools==60.8.2 wheel
-
-    - name: Set Python user directory
-      run: python -c "import os,site;open(os.environ['GITHUB_ENV'], 'a').write('USER_DIR=%s\n' % os.path.dirname(site.USER_SITE).rstrip('-32'))"
+        pip install --upgrade setuptools wheel
 
     - name: Obtain ARM64 library files
       run: |
@@ -103,17 +92,21 @@ jobs:
     - name: Build wheels
       run: python setup.py --skip-verstamp build_ext -L .\arm64libs --plat-name win-arm64 build --plat-name win-arm64 bdist_wheel --plat-name win-arm64
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: ${{ always() }}
       with:
         name: artifacts
         path: |
           dist/*.whl
 
-  black:
+  # This job can be run locally with the `format_all.bat` script
+  checkers:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - run: pip install isort pycln
+      - run: pycln . --config=pycln.toml --check
+      - run: isort . --diff --check-only
       - uses: psf/black@stable
         with:
           options: "--fast --check --diff --verbose"

.gitignore

@@ -30,9 +30,17 @@ com/TestSources/PyCOMTest/.vs/
 
 # SWIG generated files.
 com/win32comext/adsi/src/*.cpp
+!com/win32comext/adsi/src/PyADSIUtil.cpp
 com/win32comext/adsi/src/Py*.h
+!com/win32comext/adsi/src/PyADSIUtil.cpp
 com/win32comext/mapi/src/*.cpp
+!com/win32comext/mapi/src/mapiutil.cpp
+!com/win32comext/mapi/src/mapiguids.cpp
+!com/win32comext/mapi/src/PyIMAPIAdviseSink.cpp
+!com/win32comext/mapi/src/exchangeguids.cpp
 com/win32comext/mapi/src/Py*.h
+!com/win32comext/mapi/src/PyIMAPIAdviseSink.h
+!com/win32comext/mapi/src/PyMAPIUtil.h
 win32/src/*_swig.cpp
 
 

.isort.cfg

@@ -0,0 +1,7 @@
+[isort]
+py_version=37
+profile = black
+combine_as_imports = true
+skip = setup.py
+# TODO: Decide if this is wanted:
+# combine_straight_imports = true

AutoDuck/BuildHHP.py

@@ -1,7 +1,7 @@
-import os
-import sys
 import glob
+import os
 import shutil
+import sys
 
 """
 BuildHHP.py
@@ -40,7 +40,7 @@ def handle_globs(lGlobs):
     for g in lGlobs:
         new = glob.glob(g)
         if len(new) == 0:
-            print("The pattern '%s' yielded no files!" % (g,))
+            print(f"The pattern '{g}' yielded no files!")
         lFiles = lFiles + new
     # lFiles is now the list of origin files.
     # Normalize all of the paths:
@@ -111,12 +111,12 @@ def main():
             shutil.copyfile(lSrcFiles[i], file)
 
         for file in lDestFiles:
-            html_files = html_files + "%s\\%s\n" % (html_dir, file)
+            html_files = html_files + f"{html_dir}\\{file}\n"
 
     for cat in doc:
-        html_files = html_files + "%s\\%s.html\n" % (output_dir, cat.id)
+        html_files = html_files + f"{output_dir}\\{cat.id}.html\n"
         for suffix in "_overview _modules _objects _constants".split():
-            html_files = html_files + "%s\\%s%s.html\n" % (output_dir, cat.id, suffix)
+            html_files = html_files + f"{output_dir}\\{cat.id}{suffix}.html\n"
 
     f.write(sHHPFormat % {"output": output, "target": target, "html_files": html_files})
     f.close()