Merge branch 'main' into fix-whatsnew-template

Author: hugovk

…ub/workflows/source-and-docs-release.yml .github/workflows/build-release.yml.github/workflows/source-and-docs-release.yml renamed to .github/workflows/build-release.yml .github/workflows/source-and-docs-release.yml renamed to .github/workflows/build-release.yml

@@ -35,31 +35,37 @@ on:
         type: string
         description: "CPython release number (ie '3.11.5', note without the 'v' prefix)"
 
-name: "Build Python source and docs artifacts"
+name: "Build release artifacts"
 
 permissions: {}
 
 # Set from inputs for workflow_dispatch, or set defaults to test push/PR events
 env:
   GIT_REMOTE: ${{ github.event.inputs.git_remote || 'python' }}
-  GIT_COMMIT: ${{ github.event.inputs.git_commit || '4f8bb3947cfbc20f970ff9d9531e1132a9e95396' }}
-  CPYTHON_RELEASE: ${{ github.event.inputs.cpython_release || '3.13.2' }}
+  GIT_COMMIT: ${{ github.event.inputs.git_commit || '31967d8de3d27889dd1819b8dccc2bdc17c030c1' }}
+  CPYTHON_RELEASE: ${{ github.event.inputs.cpython_release || '3.14.0rc2' }}
 
 jobs:
   verify-input:
     runs-on: ubuntu-24.04
+    timeout-minutes: 5
     outputs:
-      # Needed because env vars are not available in the build-docs check below
-      cpython_release: ${{ env.CPYTHON_RELEASE }}
+      build-docs: ${{ steps.select-jobs.outputs.docs }}
+      build-android: ${{ steps.select-jobs.outputs.android }}
     steps:
       - name: "Workflow run information"
         run: |
           echo "git_remote: $GIT_REMOTE"
           echo "git_commit: $GIT_COMMIT"
           echo "cpython_release: $CPYTHON_RELEASE"
 
+      - name: "Checkout python/release-tools"
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+
       - name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           repository: "${{ env.GIT_REMOTE }}/cpython"
@@ -73,18 +79,29 @@ jobs:
             exit 1
           fi
 
+      - name: "Setup Python"
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        with:
+          python-version: 3.12
+
+      - name: "Select jobs"
+        id: select-jobs
+        run: |
+          ./select_jobs.py "$CPYTHON_RELEASE" | tee -a "$GITHUB_OUTPUT"
+
   build-source:
     runs-on: ubuntu-24.04
+    timeout-minutes: 15
     needs:
       - verify-input
     steps:
       - name: "Checkout python/release-tools"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
       - name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           repository: "${{ env.GIT_REMOTE }}/cpython"
@@ -115,14 +132,13 @@ jobs:
 
   build-docs:
     runs-on: ubuntu-24.04
+    timeout-minutes: 45
     needs:
       - verify-input
-
-    # Docs aren't built for alpha or beta releases.
-    if: (!(contains(needs.verify-input.outputs.cpython_release, 'a') || contains(needs.verify-input.outputs.cpython_release, 'b')))
+    if: fromJSON(needs.verify-input.outputs.build-docs)
     steps:
       - name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
           repository: "${{ env.GIT_REMOTE }}/cpython"
@@ -135,14 +151,19 @@ jobs:
 
       - name: "Install docs dependencies"
         run: |
-          python -m pip install \
-            -r Doc/requirements.txt
-
+          python -m pip install -r Doc/requirements.txt
           sudo apt-get update
           sudo apt-get install --yes --no-install-recommends \
-            latexmk texlive-xetex xindy texinfo texlive-latex-base \
-            texlive-fonts-recommended texlive-fonts-extra \
-            texlive-full
+            fonts-freefont-otf \
+            latexmk \
+            texinfo \
+            texlive-fonts-extra \
+            texlive-fonts-recommended \
+            texlive-latex-base \
+            texlive-latex-extra \
+            texlive-latex-recommended \
+            texlive-xetex \
+            xindy
 
       - name: "Build docs"
         run: |
@@ -158,11 +179,12 @@ jobs:
 
   test-source:
     runs-on: ubuntu-24.04
+    timeout-minutes: 60
     needs:
       - build-source
     steps:
       - name: "Download the source artifacts"
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           name: source
 
@@ -180,3 +202,38 @@ jobs:
 
           cd ../installation
           ./bin/python3 -m test -uall
+
+  build-android:
+    name: build-android (${{ matrix.arch }})
+    needs:
+      - verify-input
+    if: fromJSON(needs.verify-input.outputs.build-android)
+
+    strategy:
+      matrix:
+        include:
+          - arch: aarch64
+            runs-on: macos-15
+          - arch: x86_64
+            runs-on: ubuntu-24.04
+
+    runs-on: ${{ matrix.runs-on }}
+    timeout-minutes: 60
+    env:
+      triplet: ${{ matrix.arch }}-linux-android
+    steps:
+      - name: "Checkout ${{ env.GIT_REMOTE }}/cpython"
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          repository: "${{ env.GIT_REMOTE }}/cpython"
+          ref: "v${{ env.CPYTHON_RELEASE }}"
+
+      - name: Build and test
+        run: ./Android/android.py ci "$triplet"
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.triplet }}
+          path: cross-build/${{ env.triplet }}/dist/*
+          if-no-files-found: error

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - uses: actions/setup-python@v5

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
         python-version: ["3.12", "3.13"]
         os: [macos-latest, ubuntu-latest]
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
       - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0

LICENSE.txt

@@ -0,0 +1,46 @@
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2008 Python Software Foundation; All Rights Reserved"
+are retained in Python alone or in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.