Merge branch 'bricks_and_braces' of https://github.com/janmenjayap/sage…

… into bricks_and_braces

.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

@@ -589,6 +589,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

@@ -54,7 +54,7 @@ jobs:
           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

.gitignore

@@ -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

.gitpod.yml

@@ -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

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.beta0
+version: 10.6.beta1
 doi: 10.5281/zenodo.8042260
-date-released: 2024-12-08
+date-released: 2024-12-15
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

Makefile

@@ -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

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.6.beta0, Release Date: 2024-12-08
+SageMath version 10.6.beta1, Release Date: 2024-12-15

bootstrap

@@ -139,7 +139,6 @@ EOF
     # ONLY stderr, and to re-output the results back to stderr leaving
     # stdout alone. Basically we swap the two descriptors using a
     # third, filter, and then swap them back.
-    ./bootstrap-conda && \
     aclocal -I m4 && \
     automake --add-missing --copy build/make/Makefile-auto 3>&1 1>&2 2>&3 \
         | sed "${QUIET_SED_FILTER}" 3>&1 1>&2 2>&3 && \
@@ -226,7 +225,7 @@ save () {
 	build/make/Makefile-auto.in \
 	src/doc/en/installation/*.txt \
 	$(find src/doc/en/reference/spkg -name index.rst -prune -o -maxdepth 1 -name "*.rst" -print) \
-	environment-3.[89].yml environment-3.1[0-9].yml \
+	environment-3.[89]-*.yml environment-3.1[0-9]-*.yml \
 	src/pyproject.toml \
 	src/requirements.txt \
 	src/setup.cfg \
@@ -236,6 +235,7 @@ save () {
 	build/pkgs/gmpy2/version_requirements.txt \
 	build/pkgs/jupyter_core/version_requirements.txt \
 	build/pkgs/memory_allocator/version_requirements.txt \
+        build/pkgs/meson/version_requirements.txt \
 	build/pkgs/numpy/version_requirements.txt \
 	build/pkgs/pkgconfig/version_requirements.txt \
 	build/pkgs/pplpy/version_requirements.txt \

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=ca942ace2e5104f3ae9e57946c8228b0bdb580c5
-sha256=99c0a76943170a85d2eb868d72dd673c6b0df529d99b808458bdb3b285dec8fe
+sha1=ebc4bd50c332f06ad5b2a4ce6217ec65790655ab
+sha256=a2fa7623b406a7937ebfbe3cc6d9e17bcf0c219dec2646320b7266326d789b56

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-d129e08e85a0c6530fa140dfc04c86ac0b74e05e
+a72ae6d615ddfd3e49b36c200aaf14c24a265916

build/pkgs/execnet/distros/arch.txt

@@ -0,0 +1 @@
+python-execnet

build/pkgs/execnet/distros/debian.txt

@@ -0,0 +1 @@
+python3-execnet

build/pkgs/execnet/distros/fedora.txt

@@ -0,0 +1 @@
+python3-execnet

build/pkgs/execnet/distros/gentoo.txt

@@ -0,0 +1 @@
+dev-python/execnet

build/pkgs/execnet/distros/void.txt

@@ -0,0 +1 @@
+python3-execnet

build/pkgs/execnet/spkg-configure.m4

@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([execnet], [SAGE_PYTHON_PACKAGE_CHECK([execnet])])

build/pkgs/iniconfig/distros/arch.txt

@@ -0,0 +1 @@
+python-iniconfig

build/pkgs/iniconfig/distros/debian.txt

@@ -0,0 +1 @@
+python3-iniconfig

build/pkgs/iniconfig/distros/fedora.txt

@@ -0,0 +1 @@
+python3-iniconfig

build/pkgs/iniconfig/distros/gentoo.txt

@@ -0,0 +1 @@
+dev-python/iniconfig

build/pkgs/iniconfig/distros/void.txt

@@ -0,0 +1 @@
+python3-iniconfig

build/pkgs/iniconfig/spkg-configure.m4

@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([iniconfig], [SAGE_PYTHON_PACKAGE_CHECK([iniconfig])])

build/pkgs/planarity/spkg-configure.m4

@@ -1,6 +1,6 @@
 SAGE_SPKG_CONFIGURE([planarity], [
      AC_LANG_PUSH([C])
-     AC_CHECK_HEADER([planarity/planarity.h], [
+     AC_CHECK_HEADER([planarity/graph.h], [
         AC_CHECK_LIB([planarity], [gp_InitGraph], [
          AC_MSG_CHECKING([for planarity version 3.0 or later])
          AC_COMPILE_IFELSE(

build/pkgs/pyproject_api/distros/arch.txt

@@ -0,0 +1 @@
+python-pyproject-api

build/pkgs/pyproject_api/distros/debian.txt

@@ -0,0 +1 @@
+python3-pyproject-api

build/pkgs/pyproject_api/distros/fedora.txt

@@ -0,0 +1 @@
+python3-pyproject-api

build/pkgs/pyproject_api/distros/gentoo.txt

@@ -0,0 +1 @@
+dev-python/pyproject-api

build/pkgs/pyproject_api/distros/void.txt

@@ -0,0 +1 @@
+python3-pyproject-api

build/pkgs/pyproject_hooks/distros/arch.txt

@@ -0,0 +1 @@
+python-pyproject-hooks

build/pkgs/pyproject_hooks/distros/debian.txt

@@ -0,0 +1 @@
+python3-pyproject-hooks

build/pkgs/pyproject_hooks/distros/fedora.txt

@@ -0,0 +1 @@
+python3-pyproject-hooks

build/pkgs/pyproject_hooks/distros/gentoo.txt

@@ -0,0 +1 @@
+dev-python/pyproject-hooks

build/pkgs/pyproject_hooks/distros/void.txt

@@ -0,0 +1 @@
+python3-pyproject-hooks

build/pkgs/pyproject_hooks/spkg-configure.m4

@@ -0,0 +1 @@
+SAGE_SPKG_CONFIGURE([pyproject_hooks], [SAGE_PYTHON_PACKAGE_CHECK([pyproject_hooks])])

build/pkgs/pyproject_metadata/distros/arch.txt

@@ -0,0 +1 @@
+python-pyproject-metadata

build/pkgs/pyproject_metadata/distros/debian.txt

@@ -0,0 +1 @@
+python3-pyproject-metadata

build/pkgs/pyproject_metadata/distros/void.txt

@@ -0,0 +1 @@
+python3-pyproject-metadata

build/pkgs/sage_conf/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-conf ~= 10.6b0
+sage-conf ~= 10.6b1

build/pkgs/sage_docbuild/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-docbuild ~= 10.6b0
+sage-docbuild ~= 10.6b1

build/pkgs/sage_setup/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-setup ~= 10.6b0
+sage-setup ~= 10.6b1

build/pkgs/sage_sws2rst/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-sws2rst ~= 10.6b0
+sage-sws2rst ~= 10.6b1

build/pkgs/sagelib/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-standard ~= 10.6b0
+sagemath-standard ~= 10.6b1

build/pkgs/sagemath_bliss/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-bliss ~= 10.6b0
+sagemath-bliss ~= 10.6b1

build/pkgs/sagemath_categories/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-categories ~= 10.6b0
+sagemath-categories ~= 10.6b1

build/pkgs/sagemath_coxeter3/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-coxeter3 ~= 10.6b0
+sagemath-coxeter3 ~= 10.6b1

build/pkgs/sagemath_environment/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-environment ~= 10.6b0
+sagemath-environment ~= 10.6b1