Merge branch 'main' into pickle_93627

.cirrus.yml

@@ -0,0 +1,23 @@
+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
+  build_script:
+    - mkdir build
+    - cd build
+    - ../configure --with-pydebug
+    - 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"

.gitattributes

@@ -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

.github/CODEOWNERS

@@ -179,3 +179,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/ISSUE_TEMPLATE/bug.yml

@@ -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

.github/ISSUE_TEMPLATE/crash.yml

@@ -8,6 +8,20 @@ body:
           This form is for hard crashes of the Python interpreter, segmentation faults, failed C-level assertions, and similar. Unexpected exceptions raised from Python functions in the standard library count as bugs rather than crashes.
 
           The CPython interpreter is written in a different programming language, C. A "CPython crash" is when Python itself fails, leading to a traceback in the C stack.
+  - type: textarea
+    attributes:
+      label: What happened?
+      description: >
+        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:"
@@ -38,34 +52,3 @@ body:
       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: What happened?
-      description: >
-        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
-  - type: textarea
-    attributes:
-      label: Error messages
-      description: >
-        Enter any error messages caused by the crash, including a core dump if there is one.
-        Feel free to leave this bit blank if it isn't relevant.
-      placeholder: |
-        Error messages should be formatted like this:
-
-        <details>
-        <summary>Error messages/core dump</summary>
-
-        ```
-        # paste errors here, if you have any
-        ```
-        </details>
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/feature.yml

@@ -10,6 +10,19 @@ body:
         You'll need to demonstrate widespread support for your idea among the community.
 
         Major feature proposals should generally be discussed on [Discourse](https://discuss.python.org/c/ideas/6) before opening a GitHub issue. Wait until it's clear that most people support your idea before filling in this form.
+  - type: textarea
+    attributes:
+      label: "Proposal:"
+      description: >
+        Explain your proposal, why it should be implemented, and how it would be used.
+        Add examples, if applicable.
+        Put any code blocks inside triple backticks.
+      value: |
+        ```python
+        # Add a code block here, if required
+        ```
+    validations:
+      required: true
   - type: dropdown
     attributes:
       label: Has this already been discussed elsewhere?
@@ -25,16 +38,3 @@ body:
       label: "Links to previous discussion of this feature:"
     validations:
       required: false
-  - type: textarea
-    attributes:
-      label: "Proposal:"
-      description: >
-        Explain your proposal, why it should be implemented, and how it would be used.
-        Add examples, if applicable.
-        Put any code blocks inside triple backticks.
-      value: |
-        ```python
-        # Add a code block here, if required
-        ```
-    validations:
-      required: true

.github/workflows/build.yml

@@ -42,7 +42,7 @@ jobs:
       run_hypothesis: ${{ steps.check.outputs.run_hypothesis }}
       config_hash: ${{ steps.config_hash.outputs.hash }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check for source changes
         id: check
         run: |
@@ -111,13 +111,13 @@ jobs:
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Restore config.cache
         uses: actions/cache@v3
         with:
           path: config.cache
           key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
       - name: Install Dependencies
         run: sudo ./.github/workflows/posix-deps-apt.sh
       - name: Add ccache to PATH
@@ -174,7 +174,7 @@ jobs:
     env:
        IncludeUwp: 'true'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build CPython
       run: .\PCbuild\build.bat -e -d -p Win32
     - name: Display build info
@@ -191,7 +191,7 @@ jobs:
     env:
        IncludeUwp: 'true'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Register MSVC problem matcher
       run: echo "::add-matcher::.github/problem-matchers/msvc.json"
     - name: Build CPython
@@ -213,7 +213,7 @@ jobs:
       HOMEBREW_NO_INSTALL_CLEANUP: 1
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Restore config.cache
       uses: actions/cache@v3
       with:
@@ -247,7 +247,7 @@ jobs:
       OPENSSL_VER: 1.1.1v
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Register gcc problem matcher
       run: echo "::add-matcher::.github/problem-matchers/gcc.json"
     - name: Install Dependencies
@@ -320,7 +320,7 @@ jobs:
       OPENSSL_DIR: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}
       LD_LIBRARY_PATH: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Restore config.cache
       uses: actions/cache@v3
       with:
@@ -368,7 +368,7 @@ jobs:
       OPENSSL_VER: 1.1.1v
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Register gcc problem matcher
       run: echo "::add-matcher::.github/problem-matchers/gcc.json"
     - name: Install Dependencies
@@ -431,7 +431,7 @@ jobs:
         VENV_PYTHON=$VENV_LOC/bin/python
         echo "HYPOVENV=${VENV_LOC}" >> $GITHUB_ENV
         echo "VENV_PYTHON=${VENV_PYTHON}" >> $GITHUB_ENV
-        ./python -m venv $VENV_LOC && $VENV_PYTHON -m pip install -U hypothesis
+        ./python -m venv $VENV_LOC && $VENV_PYTHON -m pip install -r ${GITHUB_WORKSPACE}/Tools/requirements-hypothesis.txt
     - name: 'Restore Hypothesis database'
       id: cache-hypothesis-database
       uses: actions/cache@v3
@@ -478,7 +478,7 @@ jobs:
       PYTHONSTRICTEXTENSIONBUILD: 1
       ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Restore config.cache
       uses: actions/cache@v3
       with:

.github/workflows/build_msi.yml

@@ -33,6 +33,6 @@ jobs:
       matrix:
         type: [x86, x64, arm64]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build CPython installer
       run: .\Tools\msi\build.bat --doc -${{ matrix.type }}

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: "3.x"

.github/workflows/mypy.yml

@@ -9,6 +9,8 @@ on:
     paths:
       - "Tools/clinic/**"
       - "Tools/cases_generator/**"
+      - "Tools/peg_generator/**"
+      - "Tools/requirements-dev.txt"
       - ".github/workflows/mypy.yml"
   workflow_dispatch:
 
@@ -28,12 +30,16 @@ jobs:
   mypy:
     strategy:
       matrix:
-        target: ["Tools/cases_generator", "Tools/clinic"]
+        target: [
+          "Tools/cases_generator",
+          "Tools/clinic",
+          "Tools/peg_generator",
+        ]
     name: Run mypy on ${{ matrix.target }}
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"

.github/workflows/reusable-docs.yml

@@ -23,7 +23,7 @@ jobs:
       refspec_pr: '+${{ github.event.pull_request.head.sha }}:remotes/origin/${{ github.event.pull_request.head.ref }}'
     steps:
     - name: 'Check out latest PR branch commit'
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.sha }}
     # Adapted from https://github.com/actions/checkout/issues/520#issuecomment-1167205721
@@ -70,7 +70,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: 'Set up Python'
       uses: actions/setup-python@v4
       with:
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/cache@v3
       with:
         path: ~/.cache/pip

.github/workflows/verify-ensurepip-wheels.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: '3'