Merge remote-tracking branch 'upstream/develop' into safeguard-getargspec

Author: user202729

.ci/write-dockerfile.sh

@@ -275,7 +275,7 @@ 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 configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
+$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap conftest.py configure_wrapper 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

.github/workflows/build.yml

@@ -104,7 +104,7 @@ jobs:
 
       - name: Get changed files and packages
         id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           # File extensions for doctests per sage.doctest.control.skipfile
           # Also src/sage/doctests/tests/ are excluded because of nodoctest file
@@ -311,6 +311,8 @@ jobs:
 
       - name: Generate Dockerfile
         # From docker.yml
+        # tox -e <environment name> command runs commands in `tox.ini`,
+        # in particular the script `.ci/write-dockerfile.sh`, to generate `Dockerfile`.
         run: |
           tox -e ${{ env.TOX_ENV }}
           cp .tox/${{ env.TOX_ENV }}/Dockerfile .

.github/workflows/ci-linux-incremental.yml

@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get all packages that have changed
         id: changed-files
-        uses: tj-actions/changed-files@v45
+        uses: tj-actions/changed-files@v46
         with:
           files_yaml: |
             configures:

.github/workflows/ci-meson.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu]
+        os: [ubuntu, macos]
         python: ['3.11', '3.12']
         editable:
           ${{ fromJson(github.event_name == 'pull_request' && '[false]' || '[false, true]') }}

.github/workflows/doc-build.yml

@@ -173,8 +173,10 @@ jobs:
                                                   -e 's;'"$mathjax_path_from"';'"$mathjax_path_to"';' \
                                                   -e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d' \
                                                   -e 's;#L[0-9]*";";' \
-                                                  -e 's;tab-set--[0-9]*-;tab-set-;' \
+                                                  -e 's;tab-set--[0-9]*-;tab-set-;g' \
+                                                  -e 's;"tab-set--[0-9]*";"tab-set";' \
              && true)
+            # If the regex list above is changed, the sed command in "Copy doc" step should also be changed
             # Create git repo from old doc
             (cd doc && \
              git init && \
@@ -229,9 +231,10 @@ jobs:
                                                   -e 's;?v=[0-9a-f]*";";' \
                                                   -e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d' \
                                                   -e 's;#L[0-9]*";";' \
-                                                  -e 's;tab-set--[0-9]*-;tab-set-;' \
+                                                  -e 's;tab-set--[0-9]*-;tab-set-;g' \
                                                   -e 's;"tab-set--[0-9]*";"tab-set";' \
              && git commit -a -m 'wipe-out')
+            # If the regex list above is changed, the sed command in "Store old doc" step should also be changed
             # 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"

.github/workflows/docker.yml

@@ -23,20 +23,13 @@ on:
            "ubuntu-jammy",
            "debian-bullseye",
            "debian-bookworm",
-           "linuxmint-20.2",
-           "linuxmint-20.3",
-           "linuxmint-21",
-           "linuxmint-21.1",
-           "linuxmint-21.2",
-           "linuxmint-21.3",
            "fedora-40",
            "fedora-41",
            "centos-stream-9",
            "centos-stream-9-python3.12",
            "almalinux-9-python3.11",
            "archlinux-latest",
            "opensuse-15.5-gcc_11-python3.11",
-           "opensuse-tumbleweed-python3.10",
            "opensuse-tumbleweed",
           ]
         # 'tox -e update_docker_platforms' updates above

.github/workflows/lint.yml

@@ -26,30 +26,19 @@ jobs:
         .ci/merge-fixes.sh
       env:
         GH_TOKEN: ${{ github.token }}
-        SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }}
 
-    - name: Install test prerequisites
+    - name: Install prerequisites
       id: deps
-      # From docker.yml
-      run: |
-        sudo DEBIAN_FRONTEND=noninteractive apt-get update
-        sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
+      run: pip install uv
 
     - name: Code style check with ruff-minimal
       if: (success() || failure()) && steps.deps.outcome == 'success'
-      run: tox -e ruff-minimal
-      env:
-        # https://github.com/ChartBoost/ruff-action/issues/7#issuecomment-1887780308
-        RUFF_OUTPUT_FORMAT: github
-
-    - name: Code style check with pycodestyle-minimal
-      if: (success() || failure()) && steps.deps.outcome == 'success'
-      run: tox -e pycodestyle-minimal
+      run: uv run --frozen --only-group lint -- ruff check --output-format github --ignore E402,E721,E731,E741,E742,E743,F401,F402,F403,F405,F821,F841,I001,PLC0206,PLC0208,PLC2401,PLC3002,PLE0302,PLR0124,PLR0402,PLR0911,PLR0912,PLR0913,PLR0915,PLR1704,PLR1711,PLR1714,PLR1716,PLR1736,PLR2004,PLR5501,PLW0120,PLW0211,PLW0602,PLW0603,PLW0642,PLW1508,PLW1510,PLW2901,PLW3301
 
     - name: Code style check with relint
       if: (success() || failure()) && steps.deps.outcome == 'success'
-      run: tox -e relint -- src/sage/
+      run: uv run --frozen --only-group lint -- relint -c src/.relint.yml -- src/sage/
 
     - name: Validate docstring markup as RST
       if: (success() || failure()) && steps.deps.outcome == 'success'
-      run: tox -e rst
+      run: uv run --frozen --only-group lint -- flake8 --select=RST src/sage/ --config src/tox.ini

.gitignore

@@ -18,6 +18,7 @@
 /config.log
 /config.status
 /configure
+/real_configure
 /confdefs.h
 
 /m4/sage_spkg_configures.m4

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.6.beta9
+version: 10.6.rc0
 doi: 10.5281/zenodo.8042260
-date-released: 2025-03-09
+date-released: 2025-03-22
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.6.beta9, Release Date: 2025-03-09
+SageMath version 10.6.rc0, Release Date: 2025-03-22