Merge branch 'develop' into trig_func_mathematica

.ci/write-dockerfile.sh

@@ -326,7 +326,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
 #:toolchain:
 $RUN$CHECK_STATUS_THEN make \${USE_MAKEFLAGS} base-toolchain$ENDRUN$THEN_SAVE_STATUS
 
@@ -335,7 +335,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
 #:make:
 ARG TARGETS_PRE="all-sage-local"
 $RUN$CHECK_STATUS_THEN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE}$ENDRUN$THEN_SAVE_STATUS
@@ -345,7 +345,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
 $ADD .gitignore /new/.gitignore
 $ADD src /new/src
 RUN cd /new && rm -rf .git && \\
@@ -366,7 +366,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
 ARG TARGETS_OPTIONAL="ptest"
 $RUN$CHECK_STATUS_THEN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)"$ENDRUN$THEN_SAVE_STATUS
 

.codecov.yml

@@ -17,3 +17,4 @@ coverage:
         target: auto
         threshold: 0%
         base: auto
+        informational: true

.github/workflows/ci-meson.yml

@@ -0,0 +1,79 @@
+name: Build & Test using Meson
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+  workflow_dispatch:
+    # Allow to run manually
+
+concurrency:
+  # Cancel previous runs of this workflow for the same branch
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Conda (${{ matrix.os }}, Python ${{ matrix.python }})
+    runs-on: ${{ matrix.os }}-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu]
+        python: ['3.9', '3.10', '3.11']
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Merge CI fixes from sagemath/sage
+        run: |
+          .ci/merge-fixes.sh
+        env:
+          GH_TOKEN: ${{ github.token }}
+
+      - name: Cache conda packages
+        uses: actions/cache@v4
+        with:
+          path: ~/conda_pkgs_dir
+          key:
+            ${{ runner.os }}-conda-${{ hashFiles('src/environment-3.11-linux.yml') }}
+
+      - name: Compiler cache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ runner.os }}-meson-${{ matrix.python }}
+
+      - name: Setup Conda environment
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          python-version: ${{ matrix.python }}
+          miniforge-version: latest
+          use-mamba: true
+          channels: conda-forge
+          channel-priority: true
+          activate-environment: sage
+          environment-file: src/environment-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
+
+      - name: Print Conda environment
+        shell: bash -l {0}
+        run: |
+          conda info
+          conda list
+
+      - name: Build
+        shell: bash -l {0}
+        run: |
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          export CC="ccache $CC"
+          export CXX="ccache $CXX"
+          pip install --no-build-isolation --config-settings=builddir=builddir . -v
+
+      - name: Test
+        shell: bash -l {0}
+        run: |
+          # We don't install sage_setup, so don't try to test it
+          rm -R ./src/sage_setup/
+          ./sage -t --all -p4

.github/workflows/dist.yml

@@ -263,6 +263,13 @@ jobs:
         run: |
           "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*mcqd*
 
+      - name: sagemath-tdlib
+        run: |
+          case "${{ matrix.arch }}" in
+              i686) ;;  # broken - boost-related
+              *) "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*tdlib*
+          esac
+
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-${{ matrix.build }}-${{ matrix.arch }}-wheels

.gitignore

@@ -146,10 +146,12 @@ __pycache__/
 
 # Generated by sage_setup.autogen
 /src/sage/ext/interpreters
+!/src/sage/ext/interpreters/meson.build
 
 # Generated Cython files
 *.so
 **/*.so
+**/*.so.old
 /src/cython_debug
 # Most C and C++ files are generated by Cython and should not
 # be included in the sdist.
@@ -299,3 +301,171 @@ src/.coverage/
 # git worktree
 worktree*
 **/worktree*
+
+# Meson build directory
+builddir
+builddir-*
+build-install
+build/cp*
+
+# Meson temporary files
+src/sage/interfaces/__init__.py
+src/sage/crypto/block_cipher/__init__.py
+src/sage/crypto/public_key/__init__.py
+src/sage/logic/__init__.py
+src/sage/parallel/__init__.py
+src/sage/dynamics/cellular_automata/__init__.py
+src/sage/dynamics/arithmetic_dynamics/__init__.py
+src/sage/dynamics/__init__.py
+src/sage/dynamics/complex_dynamics/__init__.py
+src/sage/knots/__init__.py
+src/sage/topology/__init__.py
+src/sage/functions/__init__.py
+src/sage/manifolds/subsets/__init__.py
+src/sage/manifolds/__init__.py
+src/sage/manifolds/differentiable/examples/__init__.py
+src/sage/manifolds/differentiable/__init__.py
+src/sage/coding/source_coding/__init__.py
+src/sage/coding/guruswami_sudan/__init__.py
+src/sage/coding/__init__.py
+src/sage/coding/codecan/__init__.py
+src/sage/games/__init__.py
+src/sage/quivers/__init__.py
+src/sage/schemes/cyclic_covers/__init__.py
+src/sage/schemes/plane_conics/__init__.py
+src/sage/schemes/curves/__init__.py
+src/sage/schemes/plane_quartics/__init__.py
+src/sage/schemes/jacobians/__init__.py
+src/sage/schemes/toric/sheaf/__init__.py
+src/sage/schemes/toric/__init__.py
+src/sage/schemes/product_projective/__init__.py
+src/sage/schemes/elliptic_curves/__init__.py
+src/sage/schemes/riemann_surfaces/__init__.py
+src/sage/schemes/hyperelliptic_curves/__init__.py
+src/sage/schemes/berkovich/__init__.py
+src/sage/schemes/generic/__init__.py
+src/sage/schemes/projective/__init__.py
+src/sage/schemes/__init__.py
+src/sage/schemes/affine/__init__.py
+src/sage/modular/hecke/__init__.py
+src/sage/modular/pollack_stevens/__init__.py
+src/sage/modular/overconvergent/__init__.py
+src/sage/modular/modform/__init__.py
+src/sage/modular/quasimodform/__init__.py
+src/sage/modular/modsym/__init__.py
+src/sage/modular/local_comp/__init__.py
+src/sage/modular/quatalg/__init__.py
+src/sage/modular/ssmod/__init__.py
+src/sage/modular/abvar/__init__.py
+src/sage/modular/__init__.py
+src/sage/modular/btquotients/__init__.py
+src/sage/modular/arithgroup/__init__.py
+src/sage/modular/modform_hecketriangle/__init__.py
+src/sage/combinat/cluster_algebra_quiver/__init__.py
+src/sage/combinat/root_system/__init__.py
+src/sage/combinat/species/__init__.py
+src/sage/combinat/designs/__init__.py
+src/sage/combinat/posets/__init__.py
+src/sage/combinat/matrices/__init__.py
+src/sage/combinat/rigged_configurations/__init__.py
+src/sage/combinat/ncsf_qsym/__init__.py
+src/sage/combinat/path_tableaux/__init__.py
+src/sage/combinat/sf/__init__.py
+src/sage/combinat/__init__.py
+src/sage/combinat/chas/__init__.py
+src/sage/combinat/ncsym/__init__.py
+src/sage/combinat/words/__init__.py
+src/sage/combinat/crystals/__init__.py
+src/sage/tensor/modules/__init__.py
+src/sage/tensor/__init__.py
+src/sage/groups/matrix_gps/__init__.py
+src/sage/groups/semimonomial_transformations/__init__.py
+src/sage/groups/perm_gps/partn_ref2/__init__.py
+src/sage/groups/perm_gps/partn_ref/__init__.py
+src/sage/groups/perm_gps/__init__.py
+src/sage/groups/__init__.py
+src/sage/groups/affine_gps/__init__.py
+src/sage/groups/abelian_gps/__init__.py
+src/sage/groups/additive_abelian/__init__.py
+src/sage/groups/lie_gps/__init__.py
+src/sage/groups/misc_gps/__init__.py
+src/sage/symbolic/__init__.py
+src/sage/symbolic/integration/__init__.py
+src/sage/lfunctions/__init__.py
+src/sage/arith/__init__.py
+src/sage/ext/__init__.py
+src/sage/categories/examples/__init__.py
+src/sage/categories/__init__.py
+src/sage/modules/fg_pid/__init__.py
+src/sage/modules/__init__.py
+src/sage/modules/with_basis/__init__.py
+src/sage/modules/fp_graded/steenrod/__init__.py
+src/sage/modules/fp_graded/__init__.py
+src/sage/misc/__init__.py
+src/sage/rings/convert/__init__.py
+src/sage/rings/invariants/__init__.py
+src/sage/rings/finite_rings/__init__.py
+src/sage/rings/function_field/__init__.py
+src/sage/rings/function_field/drinfeld_modules/__init__.py
+src/sage/rings/semirings/__init__.py
+src/sage/rings/number_field/__init__.py
+src/sage/rings/__init__.py
+src/sage/rings/padics/__init__.py
+src/sage/rings/valuation/__init__.py
+src/sage/rings/asymptotic/__init__.py
+src/sage/rings/polynomial/weil/__init__.py
+src/sage/rings/polynomial/__init__.py
+src/sage/rings/polynomial/padics/__init__.py
+src/sage/monoids/__init__.py
+src/sage/matrix/__init__.py
+src/sage/matroids/__init__.py
+src/sage/interacts/__init__.py
+src/sage/__init__.py
+src/sage/plot/__init__.py
+src/sage/plot/plot3d/__init__.py
+src/sage/typeset/__init__.py
+src/sage/algebras/lie_conformal_algebras/__init__.py
+src/sage/algebras/fusion_rings/__init__.py
+src/sage/algebras/letterplace/__init__.py
+src/sage/algebras/quatalg/__init__.py
+src/sage/algebras/steenrod/__init__.py
+src/sage/algebras/finite_dimensional_algebras/__init__.py
+src/sage/algebras/__init__.py
+src/sage/algebras/hecke_algebras/__init__.py
+src/sage/algebras/lie_algebras/__init__.py
+src/sage/algebras/quantum_groups/__init__.py
+src/sage/quadratic_forms/genera/__init__.py
+src/sage/quadratic_forms/__init__.py
+src/sage/game_theory/__init__.py
+src/sage/sandpiles/__init__.py
+src/sage/sat/__init__.py
+src/sage/homology/__init__.py
+src/sage/geometry/riemannian_manifolds/__init__.py
+src/sage/geometry/hyperplane_arrangement/__init__.py
+src/sage/geometry/triangulation/__init__.py
+src/sage/geometry/polyhedron/modules/__init__.py
+src/sage/geometry/polyhedron/__init__.py
+src/sage/geometry/polyhedron/combinatorial_polyhedron/__init__.py
+src/sage/geometry/__init__.py
+src/sage/geometry/hyperbolic_space/__init__.py
+src/sage/sets/__init__.py
+src/sage/probability/__init__.py
+src/sage/numerical/backends/__init__.py
+src/sage/numerical/__init__.py
+src/sage/data_structures/__init__.py
+src/sage/graphs/graph_decompositions/__init__.py
+src/sage/graphs/generators/__init__.py
+src/sage/graphs/__init__.py
+src/sage/graphs/base/__init__.py
+src/sage/databases/__init__.py
+src/sage/stats/hmm/__init__.py
+src/sage/stats/__init__.py
+src/sage/stats/distributions/__init__.py
+src/sage/libs/gap/__init__.py
+src/sage/libs/mpfi/__init__.py
+src/sage/libs/__init__.py
+src/sage/libs/polybori/__init__.py
+src/sage/libs/mpfr/__init__.py
+src/sage/libs/mpc/__init__.py
+src/sage/calculus/transforms/__init__.py
+src/sage/calculus/__init__.py

.vscode/settings.json

@@ -15,7 +15,8 @@
         "pkgs/sage-conf_pypi/sage_root": true,
         "pkgs/sage-docbuild/sage_docbuild": true,
         "pkgs/sage-setup/sage_setup": true,
-        "pkgs/sagemath-*/sage": true
+        "pkgs/sagemath-*/sage": true,
+        "pkgs/sagemath-*/sage_setup": true
     },
     "python.testing.pytestEnabled": true,
     "python.testing.pytestArgs": [

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.5.beta7
+version: 10.5.beta8
 doi: 10.5281/zenodo.8042260
-date-released: 2024-10-12
+date-released: 2024-10-26
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.5.beta7, Release Date: 2024-10-12
+SageMath version 10.5.beta8, Release Date: 2024-10-26

bootstrap-conda

@@ -99,6 +99,9 @@ echo >&2 $0:$LINENO: generate conda environment files
     ) > environment-template.yml
     (
         sed 's/name: sage-build/name: sage/' environment-template.yml
+        echo "  - meson"
+        echo "  - meson-python"
+        echo "  - pytest"
         echo "  # Additional packages providing all dependencies for the Sage library"
         for pkg in $SAGELIB_SYSTEM_PACKAGES; do
             echo "  - $pkg"

build/pkgs/boost_cropped/patches/integral_wrapper.patch

@@ -0,0 +1,13 @@
+diff --git a/boost/mpl/aux_/integral_wrapper.hpp b/boost/mpl/aux_/integral_wrapper.hpp
+index 6bc05f7..4f3f696 100644
+--- a/boost/mpl/aux_/integral_wrapper.hpp
++++ b/boost/mpl/aux_/integral_wrapper.hpp
+@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME
+ // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
+ // while some other don't like 'value + 1' (Borland), and some don't like
+ // either
+-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
++#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) || __clang_major__ >= 16
+  private:
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=978eb775a20fea3ed9b88f0d67ecd84a3d9cd6ea
-sha256=c3987bb0f8aca81e112a17d8904ef2353a706159d43250305dc2bcac4ca2e33a
+sha1=03b46d88cb544ac683290487e94680de94d1ff50
+sha256=b687b542cfcce2a6865f7aa7164ea77ab00f082ef5cc8ef885e9dfb33c04679d

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-4326d0d9422011034a230ab3c1445fafeb2ac444
+9a5d35a91d40c9ef83fa4976f266d706028f0596