Merge remote-tracking branch 'upstream/main' into pythongh-105223-apple-readline

Author: corona10

.azure-pipelines/ci.yml

@@ -1,6 +1,3 @@
-variables:
-  coverage: false
-
 trigger: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
@@ -14,24 +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
@@ -51,33 +30,6 @@ jobs:
       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/macos-steps.yml

@@ -1,5 +1,4 @@
 parameters:
-  coverage: false
   sudo_dependencies: sudo
   dependencies: apt
   patchcheck: true
@@ -23,47 +22,16 @@ 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: make pythoninfo
+  displayName: 'Display build info'
 
-  - 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
+- 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: |

.azure-pipelines/posix-steps.yml

@@ -1,6 +1,3 @@
-variables:
-  coverage: false
-
 pr: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
@@ -14,26 +11,6 @@ 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
   dependsOn: Prebuild
@@ -53,33 +30,6 @@ jobs:
       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

.azure-pipelines/pr.yml

@@ -0,0 +1,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"

.cirrus.yml

@@ -24,7 +24,7 @@ PC/classicAppCompat.* binary
 [attr]noeol -text
 
 Lib/test/cjkencodings/*                    noeol
-Lib/test/coding20731.py                    noeol
+Lib/test/tokenizedata/coding20731.py       noeol
 Lib/test/decimaltestdata/*.decTest         noeol
 Lib/test/test_email/data/*.txt             noeol
 Lib/test/test_importlib/resources/data01/*           noeol
@@ -66,6 +66,8 @@ PCbuild/readme.txt  dos
 [attr]generated linguist-generated=true diff=generated
 
 **/clinic/*.c.h                                     generated
+**/clinic/*.cpp.h                                   generated
+**/clinic/*.h.h                                     generated
 *_db.h                                              generated
 Doc/data/stable_abi.dat                             generated
 Doc/library/token-list.inc                          generated

.gitattributes

@@ -9,6 +9,7 @@
 
 # pre-commit
 .pre-commit-config.yaml       @hugovk @AlexWaygood
+.ruff.toml                    @hugovk @AlexWaygood
 
 # Build system
 configure*                    @erlend-aasland @corona10
@@ -179,3 +180,6 @@ Doc/c-api/stable.rst          @encukou
 /Tools/clinic/**              @erlend-aasland @AlexWaygood
 /Lib/test/test_clinic.py      @erlend-aasland @AlexWaygood
 Doc/howto/clinic.rst          @erlend-aasland
+
+# WebAssembly
+/Tools/wasm/                  @brettcannon

.github/CODEOWNERS

@@ -9,20 +9,26 @@ body:
 
         For help or advice on using Python, try one of the following options instead of opening a GitHub issue:
 
-          - Posting on [Discourse](https://discuss.python.org/c/users/7)
+          - Asking on [Discourse](https://discuss.python.org/c/users/7) or [Stack Overflow](https://stackoverflow.com)
           - Reading the [Python tutorial](https://docs.python.org/3/tutorial/)
           - Emailing [python-list](https://mail.python.org/mailman/listinfo/python-list)
-  - type: checkboxes
+
+        Make sure to also search the [CPython issue tracker](https://github.com/python/cpython/issues?q=is%3Aissue+sort%3Acreated-desc) to check that the bug has not already been reported.
+  - type: textarea
     attributes:
-      label: Checklist
-      description: A bug in a third-party project (for example, `pip` or `requests`) should be reported to that project's issue tracker, not CPython
-      options:
-        - label: I am confident this is a bug in CPython, not a bug in a third-party project
-          required: false
-        - label: |
-            I have searched the [CPython issue tracker](https://github.com/python/cpython/issues?q=is%3Aissue+sort%3Acreated-desc),
-            and am confident this bug has not been reported before
-          required: false
+      label: "Bug description:"
+      description: >
+        Give a clear and concise description of what happened.
+        Include a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible.
+        [Copy and paste code where possible rather than using screenshots](https://meta.stackoverflow.com/a/285557/13990016),
+        and put any code blocks inside triple backticks.
+
+      value: |
+        ```python
+        # Add a code block here, if required
+        ```
+    validations:
+      required: true
   - type: dropdown
     attributes:
       label: "CPython versions tested on:"
@@ -47,23 +53,3 @@ body:
         - Other
     validations:
       required: false
-  - type: input
-    attributes:
-      label: "Output from running 'python -VV' on the command line:"
-      description: If you tested with multiple operating systems or architectures, feel free to provide details in the main bug description.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: "A clear and concise description of the bug:"
-      description: >
-        Tell us what happened.
-        Include a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible.
-        Put any code blocks inside triple backticks.
-
-      value: |
-        ```python
-        # Add a code block here, if required
-        ```
-    validations:
-      required: true