Merge branch 'develop' into p/locally-remove-empty-directory

Author: kwankyu

.devcontainer/portability-centos-stream-8-python3.9-minimal/devcontainer.json

@@ -118,7 +118,6 @@ jobs:
          "linuxmint-21.2",
          "fedora-38",
          "fedora-39",
-         "centos-stream-8-python3.9",
          "centos-stream-9-python3.9",
          "almalinux-8-python3.9",
          "gentoo-python3.10",

.devcontainer/portability-centos-stream-8-python3.9-minimal/portability-Dockerfile

@@ -130,10 +130,10 @@ jobs:
           new_version=$(docker exec BUILD cat src/VERSION.txt)
           mkdir -p docs/
           docker cp BUILD:/sage/local/share/doc/sage/html docs/
-          # Wipe out chronic diffs between old doc and new doc
+          # Wipe out chronic diffs of old doc against new doc
           (cd docs && \
            find . -name "*.html" | xargs sed -i -e '/class="sidebar-brand-text"/ s/Sage [0-9a-z.]* /Sage '"$new_version"' /' \
-                                                -e '/This is documentation for/ s/ built with GitHub PR [^.]*././' \
+                                                -e '/<link rel="stylesheet"/ s/?v=[0-9a-f]*"/"/' \
                                                 -e 's;'"$mathjax_path_from"';'"$mathjax_path_to"';' \
                                                 -e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d')
           # Create git repo from old doc
@@ -166,7 +166,13 @@ jobs:
           docker cp BUILD:/sage/local/share/doc/sage/html docs
           docker cp BUILD:/sage/local/share/doc/sage/index.html docs
           (cd docs && git commit -a -m 'new')
+          # Wipe out chronic diffs of new doc against old doc
+          (cd docs && \
+           find . -name "*.html" | xargs sed -i -e '/This is documentation for/ s/ built with GitHub PR .*. Doc/. Doc/' \
+                                                -e '/<link rel="stylesheet"/ s/?v=[0-9a-f]*"/"/')
           .ci/create-changes-html.sh $(cd docs && git rev-parse HEAD^) docs
+          # Restore the new doc from changes by "wipe out"
+          (cd docs && git checkout -f)
           (cd docs && rm -rf .git)
           mv CHANGES.html docs
           # We also need to replace the symlinks because netlify is not following them
@@ -176,15 +182,25 @@ jobs:
           zip -r docs.zip docs
 
       - name: Upload docs
+        id: upload
         if: (success() || failure()) && steps.copy.outcome == 'success'
         uses: actions/upload-artifact@v3
         with:
           name: docs
           path: docs.zip
 
+      - name: Save space
+        id: savespace
+        if: (success() || failure()) && steps.upload.outcome == 'success' && github.repository == 'sagemath/sage' && github.ref == 'refs/heads/develop'
+        run: |
+          set -ex
+          # Save space on runner device before we start to build livedoc
+          rm -rf docs/
+          rm -f docs.zip
+
       - name: Build live doc
         id: buildlivedoc
-        if: (success() || failure()) && steps.copy.outcome == 'success' && github.repository == 'sagemath/sage' && github.ref == 'refs/heads/develop'
+        if: (success() || failure()) && steps.savespace.outcome == 'success'
         run: |
           export MAKE="make -j5 --output-sync=recurse" SAGE_NUM_THREADS=5
           export PATH="build/bin:$PATH"
@@ -203,11 +219,11 @@ jobs:
         if: (success() || failure()) && steps.buildlivedoc.outcome == 'success'
         run: |
           mkdir -p ./livedoc
-          cp -r -L /sage/local/share/doc/sage/html ./livedoc
-          cp -r -L /sage/local/share/doc/sage/pdf ./livedoc
-          cp  /sage/local/share/doc/sage/index.html ./livedoc
+          # We copy everything to a local folder
+          docker cp --follow-link BUILD:/sage/local/share/doc/sage/html livedoc
+          docker cp --follow-link BUILD:/sage/local/share/doc/sage/pdf livedoc
+          docker cp BUILD:/sage/local/share/doc/sage/index.html livedoc
           zip -r livedoc.zip livedoc
-        shell: sh .ci/docker-exec-script.sh BUILD . {0}
 
       - name: Upload live doc
         if: (success() || failure()) && steps.copylivedoc.outcome == 'success'

.devcontainer/portability-centos-stream-8-python3.9-standard/devcontainer.json

@@ -48,7 +48,6 @@ on:
            "fedora-39",
            "fedora-40",
            "centos-7-devtoolset-gcc_11",
-           "centos-stream-8-python3.9",
            "centos-stream-9-python3.9",
            "almalinux-8-python3.9",
            "almalinux-9-python3.11",

.devcontainer/portability-centos-stream-8-python3.9-standard/portability-Dockerfile

@@ -28,14 +28,12 @@ jobs:
         GH_TOKEN: ${{ github.token }}
         SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }}
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
-
-    - name: Install dependencies
+    - name: Install test prerequisites
       id: deps
-      run: pip install tox
+      # From docker.yml
+      run: |
+        sudo DEBIAN_FRONTEND=noninteractive apt-get update
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
 
     - name: Code style check with ruff-minimal
       if: (success() || failure()) && steps.deps.outcome == 'success'

.github/workflows/ci-linux.yml

@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.4.beta9
+version: 10.4.rc0
 doi: 10.5281/zenodo.8042260
-date-released: 2024-06-09
+date-released: 2024-06-22
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

.github/workflows/doc-build.yml

@@ -1 +1 @@
-SageMath version 10.4.beta9, Release Date: 2024-06-09
+SageMath version 10.4.rc0, Release Date: 2024-06-22