Merge branch 'develop' into disable-broken-ci

Author: tobiasdiez

.github/workflows/ci-meson.yml

@@ -72,6 +72,19 @@ jobs:
           # Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda
           pip install --no-build-isolation --no-deps --config-settings=builddir=builddir . -v
 
+      - name: Check update-meson
+        # this step must be after build, because meson.build creates a number of __init__.py files
+        # that is needed to make tools/update-meson.py run correctly
+        shell: bash -l {0}
+        run: |
+          python3 tools/update-meson.py
+          if ! ./tools/test-git-no-uncommitted-changes; then
+            git add --intent-to-add .  # also show newly created files in git diff
+            git status
+            git diff
+            false
+          fi
+
       - name: Verify dependencies
         shell: bash -l {0}
         run: pip check
@@ -81,7 +94,7 @@ jobs:
         run: |
           # We don't install sage_setup, so don't try to test it
           rm -R ./src/sage_setup/
-          ./sage -t --all -p4
+          ./sage -t --all -p4 --format github
 
       - name: Upload log
         uses: actions/upload-artifact@v4.5.0

.gitignore

@@ -466,3 +466,8 @@ src/sage/libs/mpfr/__init__.py
 src/sage/libs/mpc/__init__.py
 src/sage/calculus/transforms/__init__.py
 src/sage/calculus/__init__.py
+
+# Temporary files generated by Meson CI (needed to make test pass because
+# ci-meson.yml runs a `./tools/test-git-no-uncommitted-changes` step)
+/.ccache
+/setup-miniconda-patched-environment-*.yml

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.beta6
+version: 10.6.beta7
 doi: 10.5281/zenodo.8042260
-date-released: 2025-02-10
+date-released: 2025-02-21
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

Makefile

@@ -254,13 +254,7 @@ TEST_TARGET = $@
 TEST = ./sage -t --logfile=$(TEST_LOG) $(TEST_FLAGS) --optional=$(TEST_OPTIONAL) $(TEST_FILES)
 
 test-git-no-uncommitted-changes:
-	@UNCOMMITTED=$$(git status --porcelain); \
-	if [ -n "$$UNCOMMITTED" ]; then \
-	    echo "Error: the git repo has uncommitted changes:"; \
-	    echo "$$UNCOMMITTED"; \
-	    echo; \
-	    exit 1; \
-	fi
+	./tools/test-git-no-uncommitted-changes
 
 test: all
 	@echo '### make $(TEST_TARGET): Running $(TEST)' >> $(TEST_LOG)

README.md

@@ -1 +1 @@
-SageMath version 10.6.beta6, Release Date: 2025-02-10
+SageMath version 10.6.beta7, Release Date: 2025-02-21

VERSION.txt

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=db7e875cd888f974f7de2c038b2ae75ea5a31b1b
-sha256=c905a38a83d6f718258cab25cb643c574fdb600016605c5e252584271bf6ac53
+sha1=d2332c79700273e351ce2b63347e4599e4e2ce43
+sha256=7aa9a2c919f5afc679372a632ad93494563e6ff2218ec76a3422b267cf684030

build/pkgs/configure/checksums.ini

@@ -1 +1 @@
-00c302e55c156a7dd678229ff976ed90ce3d5161
+c2766d1f6250032244ca3880f14c5b424f1bdd83

build/pkgs/configure/package-version.txt

@@ -1,4 +1,4 @@
 tarball=eclib-VERSION.tar.bz2
-sha1=3028ac95e1b76699f5f9e871ac706cda363ab842
-sha256=32d116a3e359b0de4f6486c2bb6188bb8b553c8b833f618cc2596484e8b6145a
-upstream_url=https://github.com/JohnCremona/eclib/releases/download/vVERSION/eclib-VERSION.tar.bz2
+sha1=ec8dd87df46ac5a54b548354681085d1da6e7e13
+sha256=9f8c2b32e24a4f20d7cc2d336ea30c8ea03b5b0953c2d32adda0c496e7616899
+upstream_url=https://github.com/JohnCremona/eclib/releases/download/VERSION/eclib-VERSION.tar.bz2