Merge branch 'develop' into multivariate_degree_as_integer

.ci/merge-fixes.sh

@@ -42,6 +42,7 @@ for REPO in ${SAGE_CI_FIXES_FROM_REPOSITORIES:-sagemath/sage}; do
                     # Considered alternative: Use https://github.com/$REPO/pull/$a.diff,
                     # which squashes everything into one diff without commit metadata.
                     PULL_URL="https://github.com/$REPO/pull/$a"
+                    PULL_SHORT="$REPO#$a"
                     PULL_FILE="$REPO_FILE-$a"
                     PATH=build/bin:$PATH build/bin/sage-download-file --quiet "$PULL_URL.patch" $PULL_FILE.patch
                     date -u +"%Y-%m-%dT%H:%M:%SZ" > $PULL_FILE.date  # Record the date, for future reference
@@ -67,7 +68,7 @@ for REPO in ${SAGE_CI_FIXES_FROM_REPOSITORIES:-sagemath/sage}; do
                         git am --signoff --show-current-patch=diff
                         echo "--------------------------------------------------------------------8<-----------------------------"
                         echo "::endgroup::"
-                        echo "Failure applying $PULL_URL as a patch, resetting"
+                        echo "Failure applying $PULL_SHORT as a patch, resetting"
                         git am --signoff --abort
                     fi
                 done

.github/workflows/build.yml

@@ -35,13 +35,13 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge CI fixes from sagemath/sage
         run: |
-          .ci/merge-fixes.sh
+          mkdir -p upstream
+          .ci/merge-fixes.sh 2>&1 | tee upstream/ci_fixes.log
         env:
           GH_TOKEN: ${{ github.token }}
           SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }}
       - name: Store CI fixes in upstream artifact
         run: |
-          mkdir -p upstream
           if git format-patch --stdout test_base > ci_fixes.patch; then
             cp ci_fixes.patch upstream/
           fi

.github/workflows/doc-build-pdf.yml

@@ -29,13 +29,13 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge CI fixes from sagemath/sage
         run: |
-          .ci/merge-fixes.sh
+          mkdir -p upstream
+          .ci/merge-fixes.sh 2>&1 | tee upstream/ci_fixes.log
         env:
           GH_TOKEN: ${{ github.token }}
           SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }}
       - name: Store CI fixes in upstream artifact
         run: |
-          mkdir -p upstream
           if git format-patch --stdout test_base > ci_fixes.patch; then
             cp ci_fixes.patch upstream/
           fi

.github/workflows/doc-build.yml

@@ -24,13 +24,13 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge CI fixes from sagemath/sage
         run: |
-          .ci/merge-fixes.sh
+          mkdir -p upstream
+          .ci/merge-fixes.sh 2>&1 | tee upstream/ci_fixes.log
         env:
           GH_TOKEN: ${{ github.token }}
           SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }}
       - name: Store CI fixes in upstream artifact
         run: |
-          mkdir -p upstream
           if git format-patch --stdout test_base > ci_fixes.patch; then
             cp ci_fixes.patch upstream/
           fi

.github/workflows/docker.yml

@@ -248,9 +248,8 @@ jobs:
       - name: Copy logs from the Docker image or build container
         run: |
           mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"
-          cp -r .tox/$TOX_ENV/Dockerfile .tox/$TOX_ENV/log "artifacts/$LOGS_ARTIFACT_NAME"
-          if [ -f .tox/$TOX_ENV/Dockertags ]; then CONTAINERS=$(docker create $(tail -1 .tox/$TOX_ENV/Dockertags) /bin/bash || true); fi
-          if [ -n "$CONTAINERS" ]; then for CONTAINER in $CONTAINERS; do for ARTIFACT in /sage/logs; do docker cp $CONTAINER:$ARTIFACT artifacts/$LOGS_ARTIFACT_NAME && HAVE_LOG=1; done; if [ -n "$HAVE_LOG" ]; then break; fi; done; fi
+          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@v3
         with:
@@ -262,9 +261,46 @@ jobs:
         run: |
           .github/workflows/scan-logs.sh "artifacts/$LOGS_ARTIFACT_NAME"
         if: always()
-      - name: List docker images
+      - name: List Docker images
         run: |
-          if [ -f .tox/$TOX_ENV/Dockertags ]; then
-             cat .tox/$TOX_ENV/Dockertags
+          if [ -n "$DOCKER_PUSH_REPOSITORY" -a -f .tox/$TOX_ENV/Dockertags.pushed ]; then
+             set -- $(cat .tox/$TOX_ENV/Dockertags.pushed)
+             case $# in
+                 1) images="image";  one_image="the image";;
+                 *) images="images"; one_image="one of the images";;
+             esac
+             echo "::notice title=Docker $images pushed::Pushed $images $*)"
+             echo
+             echo "To pull $one_image and enter the container, type:"
+             echo
+             for TAG in $*; do
+                 echo "  \$ docker run -it $TAG bash"
+             done
+             echo
+             echo "To use $one_image as the base for an incremental build, type:"
+             echo
+             TOX_ENV_SANS_INCREMENTAL=${TOX_ENV/-incremental/}
+             DOCKER_IMAGE=${TOX_ENV_SANS_INCREMENTAL#docker-}
+             for TAG in $*; do
+                 echo -n "  \$"
+                 if [ "$DOCKER_PUSH_REPOSITORY" != "ghcr.io/sagemath/sage/" ]; then
+                     echo -n " FROM_DOCKER_REPOSITORY=$DOCKER_PUSH_REPOSITORY"
+                 fi
+                 eval DOCKER_TARGET=\${TAG#*$DOCKER_IMAGE-}
+                 DOCKER_TARGET=${DOCKER_TARGET%:*}
+                 if [ "$DOCKER_TARGET" != "with-targets" ]; then
+                     echo -n " FROM_DOCKER_TARGET=$DOCKER_TARGET"
+                 fi
+                 echo " FROM_DOCKER_TAG=${TAG#*:} tox -e $TOX_ENV_SANS_INCREMENTAL-incremental"
+             done
+          elif [ -n "$DOCKER_PUSH_REPOSITORY" -a -f .tox/$TOX_ENV/Dockertags ]; then
+             echo "Unable to push Docker images to $DOCKER_PUSH_REPOSITORY."
+             echo "This is normal in a pull request to sagemath/sage or to another user's repository."
+             echo
+             echo "If you need Docker images, "
+             echo " - either run this GitHub Actions workflow in your repository fork"
+             echo " - or use the method described in https://doc.sagemath.org/html/en/developer/portability_testing.html#automatic-docker-based-build-testing-using-tox"
+          else
+             echo "No Docker images created."
           fi
-        if: always()
+        if: always() && ${{ inputs.docker_push_repository }}

.upstream.d/20-github.com-sagemath-sage-releases

@@ -1,5 +1,5 @@
 # Upstream packages as uploaded as GitHub release assets.
 # This file is automatically updated by the sage-update-version script.
+https://github.com/sagemath/sage/releases/download/10.4/
 https://github.com/sagemath/sage/releases/download/10.3/
 https://github.com/sagemath/sage/releases/download/10.2/
-https://github.com/sagemath/sage/releases/download/10.1/

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.3.rc3
+version: 10.4.beta0
 doi: 10.5281/zenodo.593563
-date-released: 2024-03-10
+date-released: 2024-03-25
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

CODE_OF_CONDUCT.md

@@ -37,6 +37,4 @@ Sage can more effectively collaborate with others if they follow this code.
 
 If you believe someone is violating the code of conduct, we ask that you report
 it to https://groups.google.com/g/sage-abuse. The group administrators will
-consider the issue and explore resolutions. It is also possible to move heated
-discussions to https://groups.google.com/g/sage-flame.
-
+consider the issue and explore resolutions.

Makefile

@@ -44,13 +44,25 @@ SAGE_ROOT_LOGS = logs
 # except for build/make/Makefile-auto, which is unused by the build system
 CONFIG_FILES = build/make/Makefile src/bin/sage-env-config build/bin/sage-build-env-config pkgs/sage-conf/_sage_conf/_conf.py
 
-# SPKG_COLLECT_FILES contains all files that influence the SAGE_SPKG_COLLECT macro
-SPKG_COLLECT_FILES = build/pkgs/*/type build/pkgs/*/package-version.txt build/pkgs/*/dependencies build/pkgs/*/requirements.txt build/pkgs/*/checksums.ini build/pkgs/*/spkg-install
-
-# If configure was run before, rerun it with the old arguments.
-# Otherwise, run configure with argument $PREREQ_OPTIONS.
+# SPKG_COLLECT_FILES contains the files that influence the *runtime* of the
+# portions of the 'configure' script generated by the SAGE_SPKG_COLLECT macro
+SPKG_COLLECT_FILES = build/pkgs/*/package-version.txt build/pkgs/*/dependencies*
+
+# If configure was not run before, complain.
+# If configure is newer than the files it generated (we test build/make/Makefile),
+#    we regenerate config.status by running the "config.status --recheck".
+# Either way we regenerate the generated files by calling "config.status".
 build/make/Makefile: configure $(SPKG_COLLECT_FILES) $(CONFIG_FILES:%=%.in)
-	$(MAKE) reconfigure
+	@if [ -x config.status ]; then				\
+	    case '$?' in					\
+		*configure*|*package-version*|*dependencies*)	\
+		    $(MAKE) reconfigure;;			\
+		*)						\
+		    ./config.status;;				\
+	    esac;						\
+	else							\
+	    $(MAKE) reconfigure;				\
+	fi
 
 reconfigure:
 	rm -f config.log
@@ -324,7 +336,25 @@ ptestoptionallong-nodoc:
 
 ###############################################################################
 
-configure: bootstrap src/doc/bootstrap configure.ac src/bin/sage-version.sh m4/*.m4 build/pkgs/*/spkg-configure.m4 build/pkgs/*/type build/pkgs/*/install-requires.txt build/pkgs/*/package-version.txt build/pkgs/*/distros/*.txt
+# The 'configure' script is just one of the files generated by 'bootstrap'.
+# CONFIGURE_DEPENDENCIES is the list of files that influence the generation of 'configure'.
+CONFIGURE_DEPENDENCIES =							\
+	configure.ac src/bin/sage-version.sh m4/*.m4				\
+	build/pkgs/*/spkg-configure.m4						\
+	build/pkgs/*/type build/pkgs/*/SPKG.rst					\
+	build/pkgs/*/checksums.ini build/pkgs/*/requirements.txt		\
+	build/pkgs/*/install-requires.txt build/pkgs/*/package-version.txt	\
+	build/pkgs/*/spkg-install build/pkgs/*/spkg-install.in
+
+# SPKG_INFO_DEPENDENCIES is the list of files that influence the run of 'sage-spkg-info' and hence
+# the generation of the files generated in 'src/doc' by 'src/doc/bootstrap'.
+SPKG_INFO_DEPENDENCIES =							\
+	build/pkgs/*/type build/pkgs/*/SPKG.rst					\
+	build/pkgs/*/requirements.txt						\
+	build/pkgs/*/install-requires.txt build/pkgs/*/package-version.txt	\
+	build/pkgs/*/distros/*.txt
+
+configure: bootstrap src/doc/bootstrap $(CONFIGURE_DEPENDENCIES) $(SPKG_INFO_DEPENDENCIES)
 	./bootstrap -d
 
 install: all