Merge branch 'develop' into abstract_tree/iterative

.github/workflows/build.yml

@@ -15,7 +15,7 @@ on:
       platform:
         description: 'Platform'
         required: true
-        default: 'ubuntu-jammy-standard'
+        default: 'ubuntu-noble-standard'
       docker_tag:
         description: 'Docker tag'
         required: true
@@ -68,8 +68,8 @@ concurrency:
 
 env:
   # Adapted from docker.yml
-  TOX_ENV:                "docker-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-incremental"
-  BUILD_IMAGE:            "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:ci"
+  TOX_ENV:                "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
+  BUILD_IMAGE:            "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
   FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
   FROM_DOCKER_TARGET:     "with-targets"
   FROM_DOCKER_TAG:        ${{ github.event.inputs.docker_tag || 'dev'}}

.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/[email protected]

.github/workflows/dist.yml

@@ -216,7 +216,7 @@ jobs:
       #
       CIBW_ARCHS: ${{ matrix.arch }}
       # https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python
-      CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9, <3.13"
+      CIBW_PROJECT_REQUIRES_PYTHON: ">=3.11, <3.13"
       # Environment during wheel build
       CIBW_ENVIRONMENT: "PATH=$(pwd)/prefix/bin:$PATH CPATH=$(pwd)/prefix/include:$CPATH LIBRARY_PATH=$(pwd)/prefix/lib:$LIBRARY_PATH LD_LIBRARY_PATH=$(pwd)/prefix/lib:$LD_LIBRARY_PATH PKG_CONFIG_PATH=$(pwd)/prefix/share/pkgconfig:$PKG_CONFIG_PATH ACLOCAL_PATH=/usr/share/aclocal PIP_CONSTRAINT=$(pwd)/constraints.txt PIP_FIND_LINKS=file://$(pwd)/wheelhouse SAGE_NUM_THREADS=6"
       # Use 'build', not 'pip wheel'

.github/workflows/doc-build-pdf.yml

@@ -9,7 +9,7 @@ on:
       platform:
         description: 'Platform'
         required: true
-        default: 'ubuntu-jammy-standard'
+        default: 'ubuntu-noble-standard'
       docker_tag:
         description: 'Docker tag'
         required: true
@@ -22,8 +22,8 @@ concurrency:
 
 env:
   # Same as in build.yml
-  TOX_ENV:                "docker-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-incremental"
-  BUILD_IMAGE:            "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:ci"
+  TOX_ENV:                "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
+  BUILD_IMAGE:            "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
   FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
   FROM_DOCKER_TARGET:     "with-targets"
   FROM_DOCKER_TAG:        ${{ github.event.inputs.docker_tag || 'dev'}}

.github/workflows/doc-build.yml

@@ -20,7 +20,7 @@ on:
       platform:
         description: 'Platform'
         required: true
-        default: 'ubuntu-jammy-standard'
+        default: 'ubuntu-noble-standard'
       docker_tag:
         description: 'Docker tag'
         required: true
@@ -33,8 +33,8 @@ concurrency:
 
 env:
   # Same as in build.yml
-  TOX_ENV:                "docker-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-incremental"
-  BUILD_IMAGE:            "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:ci"
+  TOX_ENV:                "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
+  BUILD_IMAGE:            "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
   FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
   FROM_DOCKER_TARGET:     "with-targets"
   FROM_DOCKER_TAG:        ${{ github.event.inputs.docker_tag || 'dev'}}

.github/workflows/pyright.yml

@@ -18,7 +18,7 @@ concurrency:
 jobs:
   pyright:
     runs-on: ubuntu-latest
-    container: ghcr.io/sagemath/sage/sage-ubuntu-jammy-standard-with-targets:dev
+    container: ghcr.io/sagemath/sage/sage-ubuntu-noble-standard-with-targets:dev
     steps:
       - name: Checkout
         id: checkout

.gitignore

@@ -158,7 +158,6 @@ __pycache__/
 /src/sage/modular/arithgroup/farey_symbol.h
 # List of C and C++ files that are actual source files,
 # NOT generated by Cython. The same list appears in src/MANIFEST.in
-!/src/sage/cpython/debugimpl.c
 !/src/sage/graphs/base/boost_interface.cpp
 !/src/sage/graphs/cliquer/cl.c
 !/src/sage/graphs/graph_decompositions/sage_tdlib.cpp
@@ -467,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

@@ -222,7 +222,7 @@ in the Installation Guide.
       more details.
 
     - Python 3.4 or later, or Python 2.7, a full installation including
-      `urllib`; but ideally version 3.9.x, 3.10.x, 3.11.x, 3.12.x, which
+      `urllib`; but ideally version 3.11.x or later, which
       will avoid having to build Sage's own copy of Python 3.
       See [build/pkgs/python3/SPKG.rst](build/pkgs/python3/SPKG.rst)
       for more details.
@@ -334,12 +334,18 @@ in the Installation Guide.
 11. Optional, but highly recommended: Set some environment variables to
     customize the build.
 
-    For example, the `MAKE` environment variable controls whether to
-    run several jobs in parallel.  On a machine with 4 processors, say,
-    typing `export MAKE="make -j4"` will configure the build script to
-    perform a parallel compilation of Sage using 4 jobs. On some
-    powerful machines, you might even consider `-j16`, as building with
-    more jobs than CPU cores can speed things up further.
+    The `MAKEFLAGS` variable controls whether to run several jobs in parallel.
+    To saturate all the execution threads of your CPU, we recommend to run
+    `export MAKEFLAGS="-j$(nproc) -l$(nproc).5"` if you are on Linux, and
+    `export MAKEFLAGS="-j$(sysctl -n hw.ncpu) -l$(sysctl -n hw.ncpu).5"` if you
+    are on macOS.
+
+    Note that the compilation may nonetheless use a different number of
+    processes, e.g., for parts that are built with `ninja` which automatically
+    decides on the amount of parallelity to use. In practice, you might
+    therefore see twice as many processes during the build process than your
+    CPU has execution threads. Unless your system is low on RAM, this should
+    not affect the time the compilation takes substantially.
 
     To reduce the terminal output during the build, type `export V=0`.
     (`V` stands for "verbosity".)
@@ -551,11 +557,11 @@ SAGE_ROOT                 Root directory (create by git clone)
 │       │   ├── installed/
 │       │   │             Records of installed non-Python packages
 │       │   ├── scripts/  Scripts for uninstalling installed packages
-│       │   └── venv-python3.9  (SAGE_VENV)
+│       │   └── venv-python  (SAGE_VENV)
 │       │       │         Installation hierarchy (virtual environment)
 │       │       │         for Python packages
 │       │       ├── bin/  Executables and installed scripts
-│       │       ├── lib/python3.9/site-packages/
+│       │       ├── lib/python/site-packages/
 │       │       │         Python modules/packages are installed here
 │       │       └── var/lib/sage/
 │       │           └── wheels/

VERSION.txt

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

build/pkgs/configure/checksums.ini

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

build/pkgs/configure/package-version.txt

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

build/pkgs/eclib/SPKG.rst

@@ -30,5 +30,5 @@ Upstream Contact
 -  Author: John Cremona
 -  Email: [email protected]
 -  Website:
-   http://homepages.warwick.ac.uk/staff/J.E.Cremona/mwrank/index.html
+   https://johncremona.github.io/mwrank/index.html
 -  Repository: https://github.com/JohnCremona/eclib

build/pkgs/eclib/checksums.ini

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

build/pkgs/eclib/package-version.txt

@@ -1 +1 @@
-20231212
+20250122

build/pkgs/eclib/spkg-configure.m4

@@ -1,7 +1,7 @@
 SAGE_SPKG_CONFIGURE([eclib], [
   SAGE_SPKG_DEPCHECK([ntl pari flint], [
     dnl use existing eclib only if the version reported by pkg-config is recent enough
-    m4_pushdef([SAGE_ECLIB_VER],["20231212"])
+    m4_pushdef([SAGE_ECLIB_VER],["20241112"])
     PKG_CHECK_MODULES([ECLIB], [eclib >= SAGE_ECLIB_VER], [
       AC_CACHE_CHECK([for mwrank version == SAGE_ECLIB_VER], [ac_cv_path_MWRANK], [
         AC_PATH_PROGS_FEATURE_CHECK([MWRANK], [mwrank], [

build/pkgs/ipython/SPKG.rst

@@ -33,7 +33,3 @@ Upstream Contact
 ----------------
 
 http://ipython.org
-
-[email protected]
-
-[email protected]

build/pkgs/python3/spkg-configure.m4

@@ -1,8 +1,8 @@
 SAGE_SPKG_CONFIGURE([python3], [
    m4_pushdef([MIN_VERSION],               [3.9.0])
    m4_pushdef([MIN_NONDEPRECATED_VERSION], [3.9.0])
-   m4_pushdef([LT_STABLE_VERSION],         [3.13.0])
-   m4_pushdef([LT_VERSION],                [3.13.0])
+   m4_pushdef([LT_STABLE_VERSION],         [3.14.0])
+   m4_pushdef([LT_VERSION],                [3.14.0])
    AC_ARG_WITH([python],
                [AS_HELP_STRING([--with-python=PYTHON3],
                                [Python 3 executable to use for the Sage venv; default: python3])])

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.6b6
+sage-conf ~= 10.6b7

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.6b6
+sage-docbuild ~= 10.6b7

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.6b6
+sage-setup ~= 10.6b7

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.6b6
+sage-sws2rst ~= 10.6b7

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.6b6
+sagemath-standard ~= 10.6b7

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.6b6
+sagemath-bliss ~= 10.6b7

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.6b6
+sagemath-categories ~= 10.6b7

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.6b6
+sagemath-coxeter3 ~= 10.6b7

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.6b6
+sagemath-environment ~= 10.6b7

build/pkgs/sagemath_mcqd/version_requirements.txt

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

build/pkgs/sagemath_meataxe/version_requirements.txt

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

build/pkgs/sagemath_objects/version_requirements.txt

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

build/pkgs/sagemath_repl/version_requirements.txt

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

build/pkgs/sagemath_sirocco/version_requirements.txt

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

build/pkgs/sagemath_tdlib/version_requirements.txt

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

pkgs/sage-conf/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sage-conf_conda/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sage-conf_pypi/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sage-docbuild/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sage-setup/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sage-setup/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Mathematics",
 ]
 urls = {Homepage = "https://www.sagemath.org"}
-requires-python = ">=3.9, <3.13"
+requires-python = ">=3.9, <3.14"
 dependencies = []
 dynamic = ["version"]
 

pkgs/sage-sws2rst/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-bliss/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-categories/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-coxeter3/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-environment/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-mcqd/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-meataxe/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-objects/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-repl/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-sirocco/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pkgs/sagemath-tdlib/VERSION.txt

@@ -1 +1 @@
-10.6.beta6
+10.6.beta7

pyproject.toml

@@ -62,16 +62,14 @@ classifiers = [
     "Operating System :: POSIX",
     "Operating System :: MacOS :: MacOS X",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Scientific/Engineering :: Mathematics",
 ]
 urls = {Homepage = "https://www.sagemath.org"}
-requires-python = ">=3.9, <3.14"
+requires-python = ">=3.11, <3.14"
 
 [project.optional-dependencies]
 R = [

pyrightconfig.json

@@ -7,7 +7,7 @@
         "root": "src"
       }
     ],  
-    "pythonVersion": "3.9",
+    "pythonVersion": "3.11",
     "exclude": ["venv"],
     "venvPath": "./venv/",
     "venv": "./",