Merge remote-tracking branch 'upstream/main' into unifyunion

.azure-pipelines/ci.yml

@@ -1,7 +1,4 @@
-variables:
-  coverage: false
-
-trigger: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
+trigger: ['main', '3.12', '3.11', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
@@ -14,70 +11,6 @@ jobs:
   - template: ./prebuild-checks.yml
 
 
-- job: macOS_CI_Tests
-  displayName: macOS CI Tests
-  dependsOn: Prebuild
-  #condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
-  # bpo-39837: macOS tests on Azure Pipelines are disabled
-  condition: false
-
-  variables:
-    testRunTitle: '$(build.sourceBranchName)-macos'
-    testRunPlatform: macos
-
-  pool:
-    vmImage: macos-10.15
-
-  steps:
-  - template: ./macos-steps.yml
-
-
-- job: Ubuntu_CI_Tests
-  displayName: Ubuntu CI Tests
-  dependsOn: Prebuild
-  condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
-
-  pool:
-    vmImage: ubuntu-22.04
-
-  variables:
-    testRunTitle: '$(build.sourceBranchName)-linux'
-    testRunPlatform: linux
-    openssl_version: 1.1.1u
-
-  steps:
-  - template: ./posix-steps.yml
-    parameters:
-      dependencies: apt
-
-
-- job: Ubuntu_Coverage_CI_Tests
-  displayName: Ubuntu CI Tests (coverage)
-  dependsOn: Prebuild
-  condition: |
-    and(
-        and(
-            succeeded(),
-            eq(variables['coverage'], 'true')
-        ),
-        eq(dependencies.Prebuild.outputs['tests.run'], 'true')
-    )
-
-  pool:
-    vmImage: ubuntu-22.04
-
-  variables:
-    testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
-    testRunPlatform: linux-coverage
-    openssl_version: 1.1.1u
-
-  steps:
-  - template: ./posix-steps.yml
-    parameters:
-      dependencies: apt
-      coverage: true
-
-
 - job: Windows_CI_Tests
   displayName: Windows CI Tests
   dependsOn: Prebuild

.azure-pipelines/posix-steps.yml

@@ -1,10 +1,3 @@
-parameters:
-  coverage: false
-  sudo_dependencies: sudo
-  dependencies: apt
-  patchcheck: true
-  xvfb: true
-
 steps:
 - checkout: self
   clean: true
@@ -14,7 +7,7 @@ steps:
 - script: sudo setfacl -Rb /home/vsts
   displayName: 'Workaround ACL issue'
 
-- script: ${{ parameters.sudo_dependencies }} ./.azure-pipelines/posix-deps-${{ parameters.dependencies }}.sh $(openssl_version)
+- script: sudo ./.azure-pipelines/posix-deps-apt.sh $(openssl_version)
   displayName: 'Install dependencies'
 
 - script: ./configure --with-pydebug
@@ -23,61 +16,11 @@ steps:
 - script: make -j4
   displayName: 'Build CPython'
 
-- ${{ if eq(parameters.coverage, 'true') }}:
-  - script: ./python -m venv venv && ./venv/bin/python -m pip install -U coverage
-    displayName: 'Set up virtual environment'
-
-  - script: ./venv/bin/python -m test.pythoninfo
-    displayName: 'Display build info'
-
-  - script: |
-      $COMMAND -m coverage run --pylib -m test \
-                --fail-env-changed \
-                -uall,-cpu \
-                --junit-xml=$(build.binariesDirectory)/test-results.xml \
-                -x test_multiprocessing_fork \
-                -x test_multiprocessing_forkserver \
-                -x test_multiprocessing_spawn \
-                -x test_concurrent_futures
-    displayName: 'Tests with coverage'
-    env:
-      ${{ if eq(parameters.xvfb, 'true') }}:
-        COMMAND: xvfb-run ./venv/bin/python
-      ${{ if ne(parameters.xvfb, 'true') }}:
-        COMMAND: ./venv/bin/python
-
-  - script: ./venv/bin/python -m coverage xml
-    displayName: 'Generate coverage.xml'
-
-  - script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash) -y .github/codecov.yml
-    displayName: 'Publish code coverage results'
-
-
-- ${{ if ne(parameters.coverage, 'true') }}:
-  - script: make pythoninfo
-    displayName: 'Display build info'
-
-  - script: $COMMAND buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
-    displayName: 'Tests'
-    env:
-      ${{ if eq(parameters.xvfb, 'true') }}:
-        COMMAND: xvfb-run make
-      ${{ if ne(parameters.xvfb, 'true') }}:
-        COMMAND: make
-
-- ${{ if eq(parameters.patchcheck, 'true') }}:
-  - script: |
-      git fetch origin
-      ./python Tools/patchcheck/patchcheck.py --ci true
-    displayName: 'Run patchcheck.py'
-    condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
-
+- script: make pythoninfo
+  displayName: 'Display build info'
 
-- task: PublishTestResults@2
-  displayName: 'Publish Test Results'
-  inputs:
-    testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
-    mergeTestResults: true
-    testRunTitle: $(testRunTitle)
-    platform: $(testRunPlatform)
-  condition: succeededOrFailed()
+- script: |
+    git fetch origin
+    ./python Tools/patchcheck/patchcheck.py --ci true
+  displayName: 'Run patchcheck.py'
+  condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))

.azure-pipelines/pr.yml

@@ -1,7 +1,4 @@
-variables:
-  coverage: false
-
-pr: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
+pr: ['main', '3.12', '3.11', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
 - job: Prebuild
@@ -14,28 +11,8 @@ jobs:
   - template: ./prebuild-checks.yml
 
 
-- job: macOS_PR_Tests
-  displayName: macOS PR Tests
-  dependsOn: Prebuild
-  #condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
-  # bpo-39837: macOS tests on Azure Pipelines are disabled
-  condition: false
-
-  variables:
-    testRunTitle: '$(system.pullRequest.TargetBranch)-macos'
-    testRunPlatform: macos
-
-  pool:
-    vmImage: macos-10.15
-
-  steps:
-  - template: ./macos-steps.yml
-    parameters:
-      targetBranch: $(System.PullRequest.TargetBranch)
-
-
-- job: Ubuntu_PR_Tests
-  displayName: Ubuntu PR Tests
+- job: Ubuntu_Patchcheck
+  displayName: Ubuntu patchcheck
   dependsOn: Prebuild
   condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
 
@@ -49,63 +26,3 @@ jobs:
 
   steps:
   - template: ./posix-steps.yml
-    parameters:
-      dependencies: apt
-
-
-- job: Ubuntu_Coverage_PR_Tests
-  displayName: Ubuntu PR Tests (coverage)
-  dependsOn: Prebuild
-  condition: |
-    and(
-        and(
-            succeeded(),
-            eq(variables['coverage'], 'true')
-        ),
-        eq(dependencies.Prebuild.outputs['tests.run'], 'true')
-    )
-
-  pool:
-    vmImage: ubuntu-22.04
-
-  variables:
-    testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
-    testRunPlatform: linux-coverage
-    openssl_version: 1.1.1u
-
-  steps:
-  - template: ./posix-steps.yml
-    parameters:
-      dependencies: apt
-      coverage: true
-
-
-- job: Windows_PR_Tests
-  displayName: Windows PR Tests
-  dependsOn: Prebuild
-  condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
-
-  pool:
-    vmImage: windows-2022
-
-  strategy:
-    matrix:
-      win32:
-        arch: win32
-        buildOpt: '-p Win32'
-        testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
-        testRunPlatform: win32
-      win64:
-        arch: amd64
-        buildOpt: '-p x64'
-        testRunTitle: '$(System.PullRequest.TargetBranch)-win64'
-        testRunPlatform: win64
-      winarm64:
-        arch: arm64
-        buildOpt: '-p arm64'
-    maxParallel: 4
-
-  steps:
-  - template: ./windows-steps.yml
-    parameters:
-      targetBranch: $(System.PullRequest.TargetBranch)

.cirrus-DISABLED.yml

@@ -0,0 +1,29 @@
+# gh-91960: Job disabled since Python is out of free credit (September 2023):
+# https://discuss.python.org/t/freebsd-gets-a-new-cirrus-ci-github-action-job-and-a-new-buildbot/33122/26
+
+freebsd_task:
+  freebsd_instance:
+    matrix:
+    - image: freebsd-13-2-release-amd64
+  # Turn off TCP and UDP blackhole.  It is not enabled by default in FreeBSD,
+  # but it is in the FreeBSD GCE images as used by Cirrus-CI.  It causes even
+  # local local connections to fail with ETIMEDOUT instead of ECONNREFUSED.
+  # For more information see https://reviews.freebsd.org/D41751 and
+  # https://github.com/cirruslabs/cirrus-ci-docs/issues/483.
+  sysctl_script:
+    - sysctl net.inet.tcp.blackhole=0
+    - sysctl net.inet.udp.blackhole=0
+  configure_script:
+    - mkdir build
+    - cd build
+    - ../configure --with-pydebug
+  build_script:
+    - cd build
+    - make -j$(sysctl -n hw.ncpu)
+  pythoninfo_script:
+    - cd build
+    - make pythoninfo
+  test_script:
+    - cd build
+    # dtrace fails to build on FreeBSD - see gh-73263
+    - make buildbottest TESTOPTS="-j0 -x test_dtrace --timeout=600"

.coveragerc

@@ -0,0 +1,24 @@
+[run]
+branch = True
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:
+    raise AssertionError\(
+
+    # Empty bodies in protocols or abstract methods
+    ^\s*def [a-zA-Z0-9_]+\(.*\)(\s*->.*)?:\s*\.\.\.(\s*#.*)?$
+    ^\s*\.\.\.(\s*#.*)?$
+
+    .*# pragma: no cover
+    .*# pragma: no branch
+
+    # Additions for IDLE:
+    .*# htest #
+    if not (_htest or _utest):
+    if not .*_utest:
+    if .*_htest:
+

.editorconfig

@@ -8,5 +8,8 @@ indent_style = space
 [*.{py,c,cpp,h}]
 indent_size = 4
 
+[*.rst]
+indent_size = 3
+
 [*.yml]
 indent_size = 2