Merge branch 'develop' into pari-2.17

Author: antonio-rojas

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

Makefile

@@ -253,9 +253,13 @@ TEST_TARGET = $@
 
 TEST = ./sage -t --logfile=$(TEST_LOG) $(TEST_FLAGS) --optional=$(TEST_OPTIONAL) $(TEST_FILES)
 
+test-git-no-uncommitted-changes:
+	./tools/test-git-no-uncommitted-changes
+
 test: all
 	@echo '### make $(TEST_TARGET): Running $(TEST)' >> $(TEST_LOG)
-	$(TEST)
+	$(TEST); \
+	$(MAKE) test-git-no-uncommitted-changes
 
 check:
 	@$(MAKE) test
@@ -302,7 +306,8 @@ ptestoptionallong:
 test-nodoc: TEST_OPTIONAL := $(TEST_OPTIONAL),!sagemath_doc_html,!sagemath_doc_pdf
 test-nodoc: build
 	@echo '### make $(TEST_TARGET): Running $(TEST)' >> $(TEST_LOG)
-	$(TEST)
+	$(TEST); \
+	$(MAKE) test-git-no-uncommitted-changes
 
 check-nodoc:
 	@$(MAKE) test-nodoc
@@ -387,5 +392,6 @@ list:
 	misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
 	test check testoptional testall testlong testoptionallong testallong \
 	ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \
+	test-git-no-uncommitted-changes \
 	list \
 	doc-clean clean sagelib-clean build-clean

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/