Merge remote-tracking branch 'upstream/develop' into doc-improve-cachefunc

Author: user202729

.ci/write-dockerfile.sh

@@ -275,11 +275,11 @@ cat <<EOF
 FROM with-system-packages AS bootstrapped
 #:bootstrapping:
 RUN rm -rf /new /sage/.git
-$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap bootstrap-conda configure.ac sage .homebrew-build-env tox.ini Pipfile.m4 .gitignore /new/
+$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
 $ADD config/config.rpath /new/config/config.rpath
 $ADD src/doc/bootstrap /new/src/doc/bootstrap
 $ADD src/bin /new/src/bin
-$ADD src/Pipfile.m4 src/pyproject.toml src/requirements.txt.m4 src/setup.cfg.m4 src/VERSION.txt /new/src/
+$ADD src/pyproject.toml src/requirements.txt.m4 src/setup.cfg.m4 src/VERSION.txt /new/src/
 $ADD m4 /new/m4
 $ADD pkgs /new/pkgs
 $ADD build /new/build

.devcontainer/onCreate-conda.sh

@@ -6,7 +6,7 @@ conda config --env --add channels conda-forge
 conda config --env --set channel_priority strict
 conda update -y --all --override-channels -c conda-forge
 conda install mamba=1 -n base -y
-mamba env create -y --file environment-dev-3.11-linux.yml || mamba env update -y --file environment-dev-3.11-linux.yml
+mamba env create -y --file environment-3.11-linux.yml || mamba env update -y --file environment-3.11-linux.yml
 conda init bash
 
 # Build sage

.github/workflows/build.yml

@@ -589,6 +589,6 @@ jobs:
 
       - name: Upload coverage to codecov
         if: (success() || failure()) && steps.container.outcome == 'success'
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           directory: .coverage/coverage-report

.github/workflows/changelog_trigger.yml

@@ -0,0 +1,23 @@
+name: Trigger Changelog Generation
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  trigger-website-repo-workflow:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger Generate Changelog Workflow in website repo
+        if: "!github.event.release.prerelease"
+        env:
+          GITHUB_PAT: ${{ secrets.WEBSITE_ACCESS_TOKEN }}
+          RELEASE_TAG: ${{ github.event.release.tag_name }}
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer $GITHUB_PAT" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/sagemath/website/actions/workflows/generate_changelog.yml/dispatches \
+            -d '{"ref":"master","inputs":{"release_tag":"'"$RELEASE_TAG"'"}}'

.github/workflows/ci-conda.yml

@@ -69,7 +69,7 @@ jobs:
           use-mamba: true
           channels: conda-forge
           channel-priority: true
-          activate-environment: sage
+          activate-environment: sage-dev
           environment-file: ${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
 
       - name: Print Conda environment

.github/workflows/ci-linux.yml

@@ -50,6 +50,7 @@ jobs:
       tox_packages_factors: >-
         ["standard"]
       docker_push_repository: ghcr.io/${{ github.repository }}/
+      logs_artifact: false
 
   # All platforms. This duplicates the default platform, but why not,
   # it makes it more robust regarding random timeouts.

.github/workflows/ci-meson.yml

@@ -47,14 +47,14 @@ jobs:
           key: ${{ runner.os }}-meson-${{ matrix.python }}
 
       - name: Setup Conda environment
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: ${{ matrix.python }}
           miniforge-version: latest
           use-mamba: true
           channels: conda-forge
           channel-priority: true
-          activate-environment: sage
+          activate-environment: sage-dev
           environment-file: environment-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
 
       - name: Print Conda environment

.github/workflows/conda-lock-update.py

@@ -154,6 +154,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Build documentation workflow"
           unzip doc.zip
+          rm doc.zip
           PR_NUMBER=""
           if [[ "$GITHUB_REF" =~ refs/pull/([0-9]+)/merge ]]; then
             PR_NUMBER="${BASH_REMATCH[1]}"
@@ -202,6 +203,10 @@ jobs:
         if: steps.docbuild.outcome == 'success'
         run: |
           set -ex
+          # Remove any existing html directory before copying a new one
+          if [ -d "doc/html" ]; then
+              rm -rf doc/html
+          fi
           # Simpler "docker cp --follow-link ... doc" does not work
           mkdir -p doc
           mkdir -p temp
@@ -217,7 +222,7 @@ jobs:
           fi
           # If so, then create CHANGES.html
           if [[ -n "$PR_NUMBER" ]]; then
-            (cd doc && git commit -a -m 'new')
+            (cd doc && git add -A && git commit --quiet -m 'new')
             # Wipe out chronic diffs of new doc against old doc before creating CHANGES.html
             (cd doc && \
              find . -name "*.html" | xargs sed -i -e '/This is documentation/ s/ built with GitHub PR .* for development/ for development/' \
@@ -229,7 +234,7 @@ jobs:
             # Since HEAD is at commit 'wipe-out', HEAD~1 is commit 'new' (new doc), HEAD~2 is commit 'old' (old doc)
             (cd doc && git diff $(git rev-parse HEAD~2) -- "*.html") > diff.txt
             # Restore the new doc dropping changes by "wipe out"
-            (cd doc && git checkout -q -f HEAD~1)
+            (cd doc && git checkout --quiet -f HEAD~1)
             .ci/create-changes-html.sh diff.txt doc
             # Sometimes rm -rf .git errors out because of some diehard hidden files
             # So we simply move it out of the doc directory

.github/workflows/doc-build.yml

@@ -85,6 +85,9 @@ on:
         description: 'Elapsed time (seconds) at which to kill the build'
         default: 20000
         type: number
+      logs_artifact:
+        default: true
+        type: boolean
       #
       # Publishing to GitHub Packages
       #
@@ -260,11 +263,12 @@ jobs:
           cp -r .tox/$TOX_ENV/* "artifacts/$LOGS_ARTIFACT_NAME"
           rm -rf "artifacts/$LOGS_ARTIFACT_NAME"/{bin,lib,pyvenv.cfg}
         if: always()
-      - uses: actions/upload-artifact@v4
+      - name: Upload logs artifact
+        uses: actions/upload-artifact@v4
         with:
           path: artifacts
           name: ${{ env.LOGS_ARTIFACT_NAME }}
-        if: always()
+        if: always() && inputs.logs_artifact
       - name: Print out logs for immediate inspection
         # and markup the output with GitHub Actions logging commands
         run: |