Merge branch 'main' into fix-test-windows-platform

Author: chris-eibl

.azure-pipelines/windows-layout-steps.yml

@@ -12,7 +12,7 @@ steps:
   displayName: Show layout info (${{ parameters.kind }})
 
 - ${{ if eq(parameters.fulltest, 'true') }}:
-  - script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)" -i test_launcher
+  - script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)"
     workingDirectory: $(Build.BinariesDirectory)\layout-${{ parameters.kind }}-$(arch)
     displayName: ${{ parameters.kind }} Tests
     env:

.gitattributes

@@ -19,7 +19,7 @@
 *.zip binary
 
 # Specific binary files
-PC/classicAppCompat.* binary
+# -- None right now --
 
 # Text files that should not be subject to eol conversion
 [attr]noeol -text

.github/CODEOWNERS

@@ -188,12 +188,8 @@ Tools/wasm/wasi               @brettcannon @emmatyping @savannahostrowski
 PC/                           @python/windows-team
 PCbuild/                      @python/windows-team
 
-# Windows installer packages
-Tools/msi/                    @python/windows-team
-Tools/nuget/                  @python/windows-team
-
-# Windows Launcher
-PC/launcher.c                 @python/windows-team @vsajip
+# Windows Venv launcher/redirector
+PC/venvlauncher.c             @python/windows-team @vsajip
 
 
 # ----------------------------------------------------------------------------

.github/workflows/build.yml

@@ -181,22 +181,6 @@ jobs:
       free-threading: ${{ matrix.free-threading }}
       interpreter: ${{ matrix.interpreter }}
 
-  build-windows-msi:
-    # ${{ '' } is a hack to nest jobs under the same sidebar category.
-    name: Windows MSI${{ '' }}  # zizmor: ignore[obfuscation]
-    needs: build-context
-    if: fromJSON(needs.build-context.outputs.run-windows-msi)
-    strategy:
-      fail-fast: false
-      matrix:
-        arch:
-        - x86
-        - x64
-        - arm64
-    uses: ./.github/workflows/reusable-windows-msi.yml
-    with:
-      arch: ${{ matrix.arch }}
-
   build-macos:
     name: >-
       macOS
@@ -650,7 +634,6 @@ jobs:
     - check-generated-files
     - check-c-api-docs
     - build-windows
-    - build-windows-msi
     - build-macos
     - build-ubuntu
     - build-ubuntu-ssltests
@@ -671,7 +654,6 @@ jobs:
         allowed-failures: >-
           build-android,
           build-emscripten,
-          build-windows-msi,
           build-ubuntu-ssltests,
           test-hypothesis,
           cifuzz,

.github/workflows/reusable-context.yml

@@ -47,9 +47,6 @@ on:  # yamllint disable-line rule:truthy
       run-wasi:
         description: Whether to run the WASI tests
         value: ${{ jobs.compute-changes.outputs.run-wasi }}  # bool
-      run-windows-msi:
-        description: Whether to run the MSI installer smoke tests
-        value: ${{ jobs.compute-changes.outputs.run-windows-msi }}  # bool
       run-windows-tests:
         description: Whether to run the Windows tests
         value: ${{ jobs.compute-changes.outputs.run-windows-tests }}  # bool
@@ -73,7 +70,6 @@ jobs:
       run-ubuntu: ${{ steps.changes.outputs.run-ubuntu }}
       run-emscripten: ${{ steps.changes.outputs.run-emscripten }}
       run-wasi: ${{ steps.changes.outputs.run-wasi }}
-      run-windows-msi: ${{ steps.changes.outputs.run-windows-msi }}
       run-windows-tests: ${{ steps.changes.outputs.run-windows-tests }}
     steps:
     - name: Set up Python

.github/workflows/reusable-windows-msi.yml

@@ -50,7 +50,7 @@ gmon.out
 
 *.exe
 
-# Ignore core dumps... but not Tools/msi/core/ or the like.
+# Ignore core dumps... but not .../core/ subdirectories
 core
 !core/
 
@@ -158,7 +158,6 @@ Tools/unicode/data/
 /coverage/
 /externals/
 /htmlcov/
-Tools/msi/obj
 Tools/ssl/amd64
 Tools/ssl/win32
 Tools/freeze/test/outdir

.gitignore

@@ -37,6 +37,10 @@ Type Objects
 
    Clear the internal lookup cache. Return the current version tag.
 
+   .. versionchanged:: 3.16
+      This function is now a no-op as the type cache is now implemented
+      per-type. It still returns the current version tag.
+
 .. c:function:: unsigned long PyType_GetFlags(PyTypeObject* type)
 
    Return the :c:member:`~PyTypeObject.tp_flags` member of *type*. This function is primarily

Doc/c-api/type.rst

@@ -3051,7 +3051,7 @@ Buffer Object Structures
 
    * Resource cleanup when the counter reaches zero must be done atomically,
      as the final release may race with concurrent releases from other
-     threads and dellocation must only happen once.
+     threads and deallocation must only happen once.
 
    The exporter MUST use the :c:member:`~Py_buffer.internal` field to keep
    track of buffer-specific resources. This field is guaranteed to remain

Doc/c-api/typeobj.rst

@@ -152,10 +152,11 @@ Alpha, beta and release candidate versions have an additional suffix:
 In other words, all versions labeled *2.0aN* precede the versions labeled
 *2.0bN*, which precede versions labeled *2.0rcN*, and *those* precede 2.0.
 
-You may also find version numbers with a "+" suffix, e.g. "2.2+".  These are
-unreleased versions, built directly from the CPython development repository.  In
-practice, after a final minor release is made, the version is incremented to the
-next minor version, which becomes the "a0" version, e.g. "2.4a0".
+You may also find version numbers with a "+dev" suffix, such as "3.15.0b3+dev".
+These are unreleased versions, built directly from the CPython development
+repository. After the first beta release is made, the version is
+incremented to the next feature version, which becomes the "a0" version,
+such as "3.16.0a0".
 
 See the `Developer's Guide
 <https://devguide.python.org/developer-workflow/development-cycle/>`__