Merge remote-tracking branch 'upstream/develop' into doctest-crash-continuation

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

.devcontainer/onCreate-conda.sh

@@ -6,7 +6,7 @@ conda config --env --add channels conda-forge
 conda config --env --set channel_priority strict
 conda update -y --all --override-channels -c conda-forge
 conda install mamba=1 -n base -y
-mamba env create -y --file environment-dev-3.11-linux.yml || mamba env update -y --file environment-dev-3.11-linux.yml
+mamba env create -y --file environment-3.11-linux.yml || mamba env update -y --file environment-3.11-linux.yml
 conda init bash
 
 # Build sage

.github/workflows/build.yml

@@ -592,6 +592,6 @@ jobs:
 
       - name: Upload coverage to codecov
         if: (success() || failure()) && steps.container.outcome == 'success'
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           directory: .coverage/coverage-report

.github/workflows/ci-conda.yml

@@ -69,7 +69,7 @@ jobs:
           use-mamba: true
           channels: conda-forge
           channel-priority: true
-          activate-environment: sage
+          activate-environment: sage-dev
           environment-file: ${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
 
       - name: Print Conda environment

.github/workflows/ci-meson.yml

@@ -47,14 +47,14 @@ jobs:
           key: ${{ runner.os }}-meson-${{ matrix.python }}
 
       - name: Setup Conda environment
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: ${{ matrix.python }}
           miniforge-version: latest
           use-mamba: true
           channels: conda-forge
           channel-priority: true
-          activate-environment: sage
+          activate-environment: sage-dev
           environment-file: environment-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
 
       - name: Print Conda environment

.github/workflows/conda-lock-update.py

@@ -27,8 +27,8 @@
 # no longer generated, but may still be in user worktrees
 /src/lib/pkgconfig
 
-# Environment files generated by bootstrap-conda.
-# The files without Python version and in src are no longer generated
+# Conda environment files
+# The files without Python version, with -dev or in src are no longer generated
 # but may still be in users' directories.
 /environment.yml
 /environment-3.9.yml

.gitignore

@@ -7,7 +7,7 @@ tasks:
   - name: Setup
     # Create conda environment, then configure and build sage
     init: >-
-      && mamba env create --file environment-dev-3.11-linux.yml --prefix venv
+      && mamba env create --file environment-3.11-linux.yml --prefix venv
       && conda config --append envs_dirs $(pwd)
       && conda activate $(pwd)/venv
       && ./bootstrap

.gitpod.yml

@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.6.beta0
+version: 10.6.beta2
 doi: 10.5281/zenodo.8042260
-date-released: 2024-12-08
+date-released: 2024-12-22
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

CITATION.cff

@@ -174,7 +174,7 @@ bootstrap-clean:
 	rm -rf config/install-sh config/compile config/config.guess config/config.sub config/missing configure build/make/Makefile-auto.in
 	rm -f src/doc/en/installation/*.txt
 	find src/doc/en/reference/spkg -name index.rst -prune -o -maxdepth 1 -name "*.rst" -exec rm -f {} \+
-	for a in environment environment-optional src/environment src/environment-dev src/environment-optional; do rm -f $$a.yml $$a-3.[89].yml $$a-3.1[0-9].yml; done
+	for a in environment environment-optional src/environment src/environment-optional; do rm -f $$a.yml $$a-3.[89].yml $$a-3.1[0-9].yml; done
 	rm -f src/requirements.txt
 	rm -f src/setup.cfg
 	rm -f build/pkgs/cypari/version_requirements.txt