Merge branch 'develop' into r-tests

Author: kwankyu

.github/workflows/doc-build.yml

@@ -132,25 +132,35 @@ jobs:
           git config --global --add safe.directory $(pwd)
           git config --global user.email "[email protected]"
           git config --global user.name "Build documentation workflow"
-          # mathjax path in old doc (regex)
-          mathjax_path_from="[-./A-Za-z_]*/tex-chtml[.]js?v=[0-9a-f]*"
-          # mathjax path in new doc
-          mathjax_path_to=$(docker exec -e SAGE_USE_CDNS=yes BUILD /sage/sage -python -c "from sage_docbuild.conf import mathjax_path; print(mathjax_path)")
-          new_version=$(docker exec BUILD cat src/VERSION.txt)
-          mkdir -p doc/
-          docker cp BUILD:/sage/local/share/doc/sage/html doc/
-          # Wipe out chronic diffs between old doc and new doc
-          (cd doc && \
-           find . -name "*.html" | xargs sed -i -e '/class="sidebar-brand-text"/ s/Sage [0-9a-z.]* /Sage '"$new_version"' /' \
-                                                -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
-          (cd doc && \
-           git init && \
-           (echo "*.svg binary"; echo "*.pdf binary") >> .gitattributes && \
-           (echo ".buildinfo"; echo '*.inv'; echo '.git*'; echo '*.svg'; echo '*.pdf'; echo '*.png'; echo 'searchindex.js') > .gitignore; \
-           git add -A && git commit --quiet -m 'old')
+          # Check if we are on PR
+          PR_NUMBER=""
+          if [[ -n "$GITHUB_REF" ]]; then
+            if [[ "$GITHUB_REF" =~ refs/pull/([0-9]+)/merge ]]; then
+              PR_NUMBER="${BASH_REMATCH[1]}"
+            fi
+          fi
+          # If so, then prepare to create CHANGES.html
+          if [[ -n "$PR_NUMBER" ]]; then
+            # mathjax path in old doc (regex)
+            mathjax_path_from="[-./A-Za-z_]*/tex-chtml[.]js?v=[0-9a-f]*"
+            # mathjax path in new doc
+            mathjax_path_to=$(docker exec -e SAGE_USE_CDNS=yes BUILD /sage/sage -python -c "from sage_docbuild.conf import mathjax_path; print(mathjax_path)")
+            new_version=$(docker exec BUILD cat src/VERSION.txt)
+            mkdir -p doc/
+            docker cp BUILD:/sage/local/share/doc/sage/html doc/
+            # Wipe out chronic diffs between old doc and new doc
+            (cd doc && \
+             find . -name "*.html" | xargs sed -i -e '/class="sidebar-brand-text"/ s/Sage [0-9a-z.]* /Sage '"$new_version"' /' \
+                                                  -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
+            (cd doc && \
+             git init && \
+             (echo "*.svg binary"; echo "*.pdf binary") >> .gitattributes && \
+             (echo ".buildinfo"; echo '*.inv'; echo '.git*'; echo '*.svg'; echo '*.pdf'; echo '*.png'; echo 'searchindex.js') > .gitignore; \
+             git add -A && git commit --quiet -m 'old')
+          fi
 
       - name: Build doc
         id: docbuild
@@ -174,21 +184,31 @@ jobs:
           # We copy everything to a local folder
           docker cp --follow-link BUILD:/sage/local/share/doc/sage/html doc
           docker cp --follow-link BUILD:/sage/local/share/doc/sage/index.html doc
-          (cd doc && git commit -a -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 for/ s/ built with GitHub PR .*. Doc/. Doc/' \
-                                                -e '/<link rel="stylesheet"/ s/?v=[0-9a-f]*"/"/' \
-                                                -e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d' \
-           && git commit -a -m 'wipe-out')
-          # Since HEAD is at commit 'wipe-out', HEAD~1 is commit 'new' (new doc), HEAD~2 is commit 'old' (old doc)
-          .ci/create-changes-html.sh $(cd doc && git rev-parse HEAD~2) doc
-          # Restore the new doc with changes made in create-changes-html.sh but dropping changes by "wipe out"
-          (cd doc && git stash -q && git checkout -q -f HEAD~1 && git stash pop -q)
-          # Sometimes rm -rf .git errors out because of some diehard hidden files
-          # So we simply move it out of the doc directory
-          (cd doc && mv .git ../git && mv .gitattributes ../gitattributes)
-          mv CHANGES.html doc
+          # Check if we are on PR
+          PR_NUMBER=""
+          if [[ -n "$GITHUB_REF" ]]; then
+            if [[ "$GITHUB_REF" =~ refs/pull/([0-9]+)/merge ]]; then
+              PR_NUMBER="${BASH_REMATCH[1]}"
+            fi
+          fi
+          # If so, then create CHANGES.html
+          if [[ -n "$PR_NUMBER" ]]; then
+            (cd doc && git commit -a -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 of/ s/ built with GitHub PR .* for development/ for development/' \
+                                                  -e '/<link rel="stylesheet"/ s/?v=[0-9a-f]*"/"/' \
+                                                  -e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d' \
+             && git commit -a -m 'wipe-out')
+            # Since HEAD is at commit 'wipe-out', HEAD~1 is commit 'new' (new doc), HEAD~2 is commit 'old' (old doc)
+            .ci/create-changes-html.sh $(cd doc && git rev-parse HEAD~2) doc
+            # Restore the new doc with changes made in create-changes-html.sh but dropping changes by "wipe out"
+            (cd doc && git stash -q && git checkout -q -f HEAD~1 && git stash pop -q)
+            # Sometimes rm -rf .git errors out because of some diehard hidden files
+            # So we simply move it out of the doc directory
+            (cd doc && mv .git ../git && mv .gitattributes ../gitattributes)
+            mv CHANGES.html doc
+          fi
           # Zip everything for increased performance
           zip -r doc.zip doc
 
@@ -228,7 +248,7 @@ jobs:
           # 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
+          docker cp --follow-link BUILD:/sage/local/share/doc/sage/index.html livedoc
           zip -r livedoc.zip livedoc
 
       - name: Upload live doc

.github/workflows/doc-publish.yml

@@ -129,6 +129,16 @@ jobs:
         run: unzip livedoc.zip -d livedoc
         if: steps.download-doc.outcome == 'success'
 
+      - name: Create _headers file for permissive CORS
+        run: |
+          cat <<EOF > livedoc/livedoc/_headers
+          /*
+            Access-Control-Allow-Origin: *
+            Access-Control-Allow-Methods: GET
+            Access-Control-Allow-Headers: Content-Type
+          EOF
+        if: steps.download-doc.outcome == 'success'
+
       - name: Deploy to netlify with doc-TAG alias
         id: deploy-netlify
         uses: netlify/actions/cli@master

CITATION.cff

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

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.4.rc2, Release Date: 2024-07-04
+SageMath version 10.4.rc3, Release Date: 2024-07-12

build/pkgs/asttokens/checksums.ini

@@ -1,4 +1,4 @@
-tarball=asttokens-VERSION.tar.gz
-sha1=d522a139240293953c99d32ca62c41542babb963
-sha256=b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0
-upstream_url=https://pypi.io/packages/source/a/asttokens/asttokens-VERSION.tar.gz
+tarball=asttokens-VERSION-py2.py3-none-any.whl
+sha1=69a9448cd7fad3007a66f464f9daa35dd28183a6
+sha256=051ed49c3dcae8913ea7cd08e46a606dba30b79993209636c4875bc1d637bc24
+upstream_url=https://pypi.io/packages/py2.py3/a/asttokens/asttokens-VERSION-py2.py3-none-any.whl

build/pkgs/asttokens/dependencies

@@ -1,4 +1,4 @@
- | $(PYTHON_TOOLCHAIN) $(PYTHON)
+six | pip $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/asttokens/spkg-install.in

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=1451031f1325bb7d31929b92415ee25795ed7022
-sha256=a5c2064d5c792d32bbfa6c97a72aab395764ed7882f9bcadb8f04ca34c42c6b4
+sha1=a78a0025292f4831f84dc059734320de0e66e216
+sha256=c108de2bfbbf3f2543ada5742d5bc9a58df700d8b6125df92b1888f867b60174

build/pkgs/configure/checksums.ini

@@ -1 +1 @@
-812a1160c06c055f74f9fcc86a7678c5a7a8788c
+74119807d7989c879f2eee167e4e29af7c4f588a

build/pkgs/configure/package-version.txt

@@ -1,4 +1,4 @@
-tarball=cppy-VERSION.tar.gz
-sha1=c82ee7a4f38e302bfe4de2a695d2bdfefb69951f
-sha256=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b
-upstream_url=https://files.pythonhosted.org/packages/source/c/cppy/cppy-VERSION.tar.gz
+tarball=cppy-VERSION-py3-none-any.whl
+sha1=57304a8ceaaf7cb34e4315aa9b8084b17fc0332c
+sha256=c5b5eac3d3f42593a07d35275b0bc27f447b76b9ad8f27c62e3cfa286dc1988a
+upstream_url=https://pypi.io/packages/py3/c/cppy/cppy-VERSION-py3-none-any.whl