jacksonwalters
diff --git a/‎.ci/create-changes-html.sh
Lines changed: 1 addition & 1 deletion b/‎.ci/create-changes-html.sh
Lines changed: 1 addition & 1 deletion
diff --git a/‎.ci/merge-fixes.sh
Lines changed: 2 additions & 1 deletion b/‎.ci/merge-fixes.sh
Lines changed: 2 additions & 1 deletion
diff --git a/‎.devcontainer/devcontainer.json
Lines changed: 2 additions & 3 deletions b/‎.devcontainer/devcontainer.json
Lines changed: 2 additions & 3 deletions
diff --git a/‎.github/workflows/build.yml
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/build.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/doc-build-pdf.yml
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/doc-build-pdf.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/doc-build.yml
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/doc-build.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/docker.yml
Lines changed: 43 additions & 7 deletions b/‎.github/workflows/docker.yml
Lines changed: 43 additions & 7 deletions
diff --git a/‎.upstream.d/20-github.com-sagemath-sage-releases
Lines changed: 1 addition & 1 deletion b/‎.upstream.d/20-github.com-sagemath-sage-releases
Lines changed: 1 addition & 1 deletion
diff --git a/‎.vscode/extensions.json
Lines changed: 2 additions & 1 deletion b/‎.vscode/extensions.json
Lines changed: 2 additions & 1 deletion
diff --git a/‎.vscode/settings.json
Lines changed: 0 additions & 5 deletions b/‎.vscode/settings.json
Lines changed: 0 additions & 5 deletions
@@ -19,8 +19,8 @@ echo '<script>hljs.highlightAll();</script>' >> CHANGES.html
 cat >> CHANGES.html << EOF
 <script>
 document.addEventListener('DOMContentLoaded', () => {
+const baseDocURL = 'https://sagemath.netlify.app'
 const diffSite = 'https://pianomister.github.io/diffsite'
-const baseDocURL = 'https://sagemath-tobias.netlify.app'
 const diffParagraphs = document.querySelectorAll('p.diff');
 diffParagraphs.forEach(paragraph => {
   const rootURL = window.location.origin;
 
@@ -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
 
@@ -22,13 +22,12 @@
 		"vscode": {
 			"extensions": [
 				"guyskk.language-cython",
-				"ms-python.isort",
 				"ms-toolsai.jupyter",
 				"ms-python.vscode-pylance",
-				"ms-python.pylint",
 				"ms-python.python",
 				"lextudio.restructuredtext",
-				"trond-snekvik.simple-rst"
+				"trond-snekvik.simple-rst",
+				"charliermarsh.ruff"
 			]
 		}
 	}
 
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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 }}
@@ -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/
@@ -2,6 +2,7 @@
 	// List of extensions which should be recommended for developers when a workspace is opened for the first time.
 	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
 	"recommendations": [
-		"ms-python.python"
+		"ms-python.python",
+		"charliermarsh.ruff"
 	],
 }
@@ -24,11 +24,6 @@
         "--doctest-modules"
     ],
     "python.testing.unittestEnabled": false,
-    "python.linting.pycodestyleEnabled": true,
-    "python.linting.enabled": true,
-    // The following pycodestyle arguments are the same as the pycodestyle-minimal
-    // tox environnment, see the file SAGE_ROOT/src/tox.ini
-    "python.linting.pycodestyleArgs": ["--select= E111,E21,E222,E225,E227,E228,E25,E271,E303,E305,E306,E401,E502,E701,E702,E703,E71,E72,W291,W293,W391,W605"],
     "cSpell.words": [
         "furo",
         "Conda",
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,12 @@`
`22`	`22`	`"vscode": {`
`23`	`23`	`"extensions": [`
`24`	`24`	`"guyskk.language-cython",`
`25`		`- "ms-python.isort",`
`26`	`25`	`"ms-toolsai.jupyter",`
`27`	`26`	`"ms-python.vscode-pylance",`
`28`		`- "ms-python.pylint",`
`29`	`27`	`"ms-python.python",`
`30`	`28`	`"lextudio.restructuredtext",`
`31`		`- "trond-snekvik.simple-rst"`
	`29`	`+ "trond-snekvik.simple-rst",`
	`30`	`+ "charliermarsh.ruff"`
`32`	`31`	`]`
`33`	`32`	`}`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// List of extensions which should be recommended for developers when a workspace is opened for the first time.`
`3`	`3`	`// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.`
`4`	`4`	`"recommendations": [`
`5`		`- "ms-python.python"`
	`5`	`+ "ms-python.python",`
	`6`	`+ "charliermarsh.ruff"`
`6`	`7`	`],`
`7`	`8`	`}`