Merge branch 'develop' into lins

Author: enriqueartal

.github/workflows/ci-conda-known-test-failures.json

@@ -84,14 +84,14 @@ jobs:
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
-      - name: Bootstrap with sage-update-version
+      - name: Bootstrap with update-version
         # We set SAGE_ROOT and SAGE_SRC by hand
         # because 'sage -sh' does not work with an unconfigured tree,
         # giving: Error: SAGE_SCRIPTS_DIR is set to a bad value
         run: |
           git config --global user.email "nobody@example.com"
           git config --global user.name "Sage GitHub CI"
-          SAGE_ROOT=. SAGE_SRC=./src src/bin/sage-update-version $(cat src/VERSION.txt).dev0 || echo "(ignoring error)"
+          SAGE_ROOT=. SAGE_SRC=./src tools/update-version $(cat src/VERSION.txt).dev0 || echo "(ignoring error)"
       - name: make dist
         run: |
           ./configure --enable-download-from-upstream-url && make dist

.github/workflows/ci-conda.yml

@@ -123,7 +123,7 @@ jobs:
           # If editable then deleting the directory will cause sage to detect rebuild, which will cause ninja to fail
           # so we don't delete the directory in this case
           ${{ matrix.editable && 'true' || 'rm -R ./src/sage_setup/' }}
-          ./sage -t --${{ matrix.tests }} -p4 --format github
+          ./sage -t ${{ matrix.tests == 'all' && '--all' || '--new --long' }} -p4 --format github
 
       - name: Check that all modules can be imported
         shell: bash -l {0}

.github/workflows/ci-macos.yml

@@ -2,4 +2,3 @@
 # This file is automatically updated by the sage-update-version script.
 https://github.com/sagemath/sage/releases/download/10.7/
 https://github.com/sagemath/sage/releases/download/10.6/
-https://github.com/sagemath/sage/releases/download/10.5/

.github/workflows/ci-meson.yml

@@ -9,7 +9,6 @@
         // Exclude symbolic links into SAGE_ROOT/pkgs/
         "build/pkgs/*/src": true,
         // Exclude symbolic links into SAGE_ROOT/src/
-        "pkgs/sage-conf_conda/sage_root": true,
         "pkgs/sage-conf_pypi/sage_root": true,
         "pkgs/sage-docbuild/sage_docbuild": true,
         "pkgs/sage-setup/sage_setup": true,

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

@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.7.beta0
+version: 10.7.beta1
 doi: 10.5281/zenodo.8042260
-date-released: 2025-04-02
+date-released: 2025-04-18
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

.vscode/settings.json

@@ -1 +1 @@
-SageMath version 10.7.beta0, Release Date: 2025-04-02
+SageMath version 10.7.beta1, Release Date: 2025-04-18

CITATION.cff

@@ -24,5 +24,5 @@ Special Update/Build Instructions
 ---------------------------------
 
 This tarball is automatically generated by Sage whenever you run the
-$SAGE_ROOT/bootstrap -s or the $SAGE_ROOT/src/bin/sage-update-version
+$SAGE_ROOT/bootstrap -s or the $SAGE_ROOT/tools/update-version
 script.

VERSION.txt

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=3371667ee074aefdde8fc64ad60928a29a1e3578
-sha256=4e93801f29ba7d242285ed1461300586b50db56474e84cefe0b793f8dbf54842
+sha1=db1650ff7b9bb3d07adbf2c6c1d4be2e39c22920
+sha256=7998f8b4ce7b527248461f87b305752f18d07460792d157447bd31b45b0dbc3d