Merge branch 'sagemath:develop' into partitions/cardinality

.github/workflows/ci-meson.yml

@@ -47,7 +47,7 @@ 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

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

VERSION.txt

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

build/bin/sage-dist-helpers

@@ -71,10 +71,9 @@
 #
 # - sdh_cmake [...]
 #
-#    Runs `cmake` in the current directory with the given arguments, as well as
-#    additional arguments passed to cmake (assuming packages are using the
-#    GNUInstallDirs module) so that `CMAKE_INSTALL_PREFIX` and
-#    `CMAKE_INSTALL_LIBDIR` are set correctly.
+#    Runs `cmake` with the given arguments, as well as additional arguments
+#    (assuming packages are using the GNUInstallDirs module) so that
+#    `CMAKE_INSTALL_PREFIX` and `CMAKE_INSTALL_LIBDIR` are set correctly.
 #
 # - sdh_install [-T] SRC [SRC...] DEST
 #
@@ -416,9 +415,9 @@ sdh_pip_uninstall() {
 
 sdh_cmake() {
     echo "Configuring $PKG_NAME with cmake"
-    cmake . -DCMAKE_INSTALL_PREFIX="${SAGE_INST_LOCAL}" \
-            -DCMAKE_INSTALL_LIBDIR=lib \
-            "$@"
+    cmake -DCMAKE_INSTALL_PREFIX="${SAGE_INST_LOCAL}" \
+          -DCMAKE_INSTALL_LIBDIR=lib \
+          "$@"
     if [ $? -ne 0 ]; then
         if [ -f "$(pwd)/CMakeFiles/CMakeOutput.log" ]; then
             sdh_die <<_EOF_

build/pkgs/bliss/spkg-install.in

@@ -3,6 +3,6 @@ if [ "$UNAME" = "Darwin" ]; then
     export LDFLAGS
 fi
 cd src
-sdh_cmake -DUSE_GMP=OFF -DCMAKE_VERBOSE_MAKEFILE=ON
+sdh_cmake -DUSE_GMP=OFF -DCMAKE_VERBOSE_MAKEFILE=ON .
 sdh_make
 sdh_make_install

build/pkgs/ccache/checksums.ini

@@ -1,3 +1,4 @@
-tarball=ccache-VERSION.tar.bz2
-sha1=3653e0765f01697c449f7026c479fbd9526323a7
-sha256=fa9d7f38367431bc86b19ad107d709ca7ecf1574fdacca01698bdf0a47cd8567
+tarball=ccache-VERSION.tar.xz
+sha1=cff97f7592f5042eb43cb54a6d12a1ce7e49da62
+sha256=c0b85ddfc1a3e77b105ec9ada2d24aad617fa0b447c6a94d55890972810f0f5a
+upstream_url=https://github.com/ccache/ccache/releases/download/vVERSION/ccache-VERSION.tar.xz

build/pkgs/ccache/dependencies

@@ -1,4 +1,4 @@
-zlib
+cmake xz
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/ccache/distros/arch.txt

@@ -0,0 +1 @@
+ccache

build/pkgs/ccache/package-version.txt

@@ -1 +1 @@
-3.3.4
+4.10.2

build/pkgs/ccache/spkg-install.in

@@ -1,14 +1,14 @@
 cd src
 
-# Use newer version of config.guess and config.sub (see Issue #23710)
-cp "$SAGE_ROOT"/config/config.* .
-
-export CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS"
-sdh_configure
+mkdir build
+cd build
+sdh_cmake -DCMAKE_BUILD_TYPE=Release \
+          -DENABLE_TESTING=OFF \
+		  -DREDIS_STORAGE_BACKEND=OFF \
+		  ..
 sdh_make
 sdh_make_install
 
-
 set -e
 
 mkdir -p "$SAGE_LOCAL/libexec/ccache"
@@ -21,4 +21,4 @@ ln -sf ../../bin/ccache "$SAGE_LOCAL/libexec/ccache/clang++"
 
 # Copy a reasonable default configuration for Sage
 # (cache size of 4G and compression enabled)
-cp -p ../ccache.conf "$SAGE_LOCAL/etc"
+cp -p ../../ccache.conf "$SAGE_LOCAL/etc"

build/pkgs/cmake/checksums.ini

@@ -1,4 +1,4 @@
 tarball=cmake-VERSION.tar.gz
-sha1=05de9ac807fefeb2a36ed5e8fcea376a00dd3d57
-sha256=fece24563f697870fbb982ea8bf17482c9d5f855d8c9bf0b82463d76c9e8d0cc
+sha1=b87bd9de209a60d7bc81b8fed594ea26adb4f716
+sha256=42abb3f48f37dbd739cdfeb19d3712db0c5935ed5c2aef6c340f9ae9114238a2
 upstream_url=https://github.com/Kitware/CMake/releases/download/vVERSION/cmake-VERSION.tar.gz

build/pkgs/cmake/package-version.txt

@@ -1 +1 @@
-3.27.8
+3.31.2

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=ebc4bd50c332f06ad5b2a4ce6217ec65790655ab
-sha256=a2fa7623b406a7937ebfbe3cc6d9e17bcf0c219dec2646320b7266326d789b56
+sha1=a03b8a505678cba0d652514d739bd32eb30bb925
+sha256=6525b44fea6b9d0238ca4790e8be5168e8d08c350787704a59ada9b6075a1f0f

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-a72ae6d615ddfd3e49b36c200aaf14c24a265916
+291e54bf234b1753909f22a043e91a4a639693c1

build/pkgs/dsdp/spkg-install.in

@@ -5,6 +5,7 @@ sdh_cmake -DCMAKE_BUILD_TYPE=Release \
           -DBUILD_SHARED_LIBS=ON \
           -DBLA_VENDOR=OpenBLAS \
           -DBLAS_LIBRARIES="$(pkg-config --libs blas)" \
-          -DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
+          -DLAPACK_LIBRARIES="$(pkg-config --libs lapack)" \
+          .
 sdh_make
 sdh_make_install

build/pkgs/primecount/spkg-install.in

@@ -36,6 +36,7 @@ sdh_cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
           -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH \
           -DCMAKE_INSTALL_PREFIX=$SAGE_LOCAL \
           -DWITH_POPCNT=OFF \
+          . \
           && sdh_make_install
 }
 

build/pkgs/primesieve/spkg-install.in

@@ -9,6 +9,7 @@ sdh_cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
           -DBUILD_STATIC_LIBS=OFF \
           -DBUILD_SHARED_LIBS=ON \
           -DBUILD_TESTS=ON \
-          ${EXTRA_OPTS}
+          ${EXTRA_OPTS} \
+          .
 
 sdh_make_install

build/pkgs/qhull/spkg-install.in

@@ -1,7 +1,8 @@
 cd src/
 
 sdh_cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
-          -DLIB_INSTALL_DIR="${SAGE_LOCAL}"/lib
+          -DLIB_INSTALL_DIR="${SAGE_LOCAL}"/lib \
+          .
 
 sdh_make
 

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

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

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

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

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

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

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

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

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

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.6b1
+sagemath-mcqd ~= 10.6b2

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.6b1
+sagemath-meataxe ~= 10.6b2

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.6b1
+sagemath-objects ~= 10.6b2

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.6b1
+sagemath-repl ~= 10.6b2

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.6b1
+sagemath-sirocco ~= 10.6b2

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.6b1
+sagemath-tdlib ~= 10.6b2

build/pkgs/scip/spkg-install.in

@@ -2,16 +2,16 @@ cd src
 mkdir build
 cd build
 sdh_cmake -DCMAKE_INSTALL_LIBDIR=lib \
-         -DCMAKE_VERBOSE_MAKEFILE=ON \
-         -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
-         -DGMP_DIR="${SAGE_GMP_PREFIX}" \
-         -DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \
-         -DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \
-         -DIPOPT=off \
-         -DPAPILO=on -DPAPILO_DIR="${SAGE_LOCAL}" \
-         -DZIMPL=off \
-         -DAMPL=off \
-         -DSYM=bliss \
-         ..
+          -DCMAKE_VERBOSE_MAKEFILE=ON \
+          -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
+          -DGMP_DIR="${SAGE_GMP_PREFIX}" \
+          -DReadline_ROOT_DIR=$(pkg-config --variable=prefix readline) \
+          -DHistory_ROOT_DIR=$(pkg-config --variable=prefix readline) \
+          -DIPOPT=off \
+          -DPAPILO=on -DPAPILO_DIR="${SAGE_LOCAL}" \
+          -DZIMPL=off \
+          -DAMPL=off \
+          -DSYM=bliss \
+          ..
 sdh_make
 sdh_make_install

build/pkgs/scip_sdp/spkg-install.in

@@ -2,14 +2,14 @@ cd src
 mkdir build
 cd build
 sdh_cmake -DCMAKE_INSTALL_LIBDIR=lib \
-         -DCMAKE_VERBOSE_MAKEFILE=ON \
-         -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
-         -DBLA_VENDOR=OpenBLAS \
-         -DBLAS_LIBRARIES="$(pkg-config --libs blas)" \
-         -DLAPACK_LIBRARIES="$(pkg-config --libs lapack)" \
-         -DSCIP_DIR="${SAGE_LOCAL}" \
-         -DSYM=bliss \
-         -DSDPS=dsdp \
-         ..
+          -DCMAKE_VERBOSE_MAKEFILE=ON \
+          -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON \
+          -DBLA_VENDOR=OpenBLAS \
+          -DBLAS_LIBRARIES="$(pkg-config --libs blas)" \
+          -DLAPACK_LIBRARIES="$(pkg-config --libs lapack)" \
+          -DSCIP_DIR="${SAGE_LOCAL}" \
+          -DSYM=bliss \
+          -DSDPS=dsdp \
+          ..
 sdh_make
 sdh_make_install

build/pkgs/suitesparse/spkg-install.in

@@ -5,7 +5,7 @@ echo "Configuring suitesparse"
 # Hopefully these sill be normalised in the future.
 # * SUITESPARSE_INCLUDEDIR_POSTFIX sets the subfolder in which to install headers.
 # It default to "suitesparse" if not defined, which currently breaks dependencies.
-# * SUITESPARSE_USE_FORTRAN make sure the fortran interface is off. There is trouble when 
+# * SUITESPARSE_USE_FORTRAN make sure the fortran interface is off. There is trouble when
 # gcc and gfortran version are not matching.
 # * SUITESPARSE_ENABLE_PROJECTS semi column separated list of the desired packages. Default is
 # all the packages in the suitesparse tarball.
@@ -16,6 +16,7 @@ sdh_cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
           -DNSTATIC=ON \
           -DSUITESPARSE_USE_FORTRAN=OFF \
           -DSUITESPARSE_INCLUDEDIR_POSTFIX="" \
-          -DSUITESPARSE_ENABLE_PROJECTS="suitesparse_config;amd;camd;ccolamd;colamd;cholmod;umfpack"
+          -DSUITESPARSE_ENABLE_PROJECTS="suitesparse_config;amd;camd;ccolamd;colamd;cholmod;umfpack" \
+          .
 
 sdh_make_install

build/pkgs/symengine/spkg-install.in

@@ -2,18 +2,18 @@ cd src
 mkdir build
 cd build
 sdh_cmake -DCMAKE_PREFIX_PATH="$SAGE_LOCAL" \
-      -DWITH_SYMENGINE_THREAD_SAFE=yes \
-      -DWITH_ECM=yes \
-      -DWITH_FLINT=yes \
-      -DWITH_ARB=yes \
-      -DWITH_MPFR=yes \
-      -DWITH_MPC=yes \
-      -DWITH_LLVM=no \
-      -DINTEGER_CLASS="flint" \
-      -DBUILD_BENCHMARKS=no \
-      -DBUILD_SHARED_LIBS=yes \
-      -DBUILD_TESTS=yes \
-      ..
+          -DWITH_SYMENGINE_THREAD_SAFE=yes \
+          -DWITH_ECM=yes \
+          -DWITH_FLINT=yes \
+          -DWITH_ARB=yes \
+          -DWITH_MPFR=yes \
+          -DWITH_MPC=yes \
+          -DWITH_LLVM=no \
+          -DINTEGER_CLASS="flint" \
+          -DBUILD_BENCHMARKS=no \
+          -DBUILD_SHARED_LIBS=yes \
+          -DBUILD_TESTS=yes \
+          ..
 
 sdh_make
 sdh_make install

pkgs/sage-conf/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sage-conf_conda/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sage-conf_pypi/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sage-docbuild/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sage-setup/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sage-sws2rst/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-bliss/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-categories/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-coxeter3/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-environment/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-mcqd/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-meataxe/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-objects/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-repl/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-sirocco/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

pkgs/sagemath-tdlib/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

src/VERSION.txt

@@ -1 +1 @@
-10.6.beta1
+10.6.beta2

src/bin/sage-version.sh

@@ -4,6 +4,6 @@
 # which stops "setup.py develop" from rewriting it as a Python file.
 :
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='10.6.beta1'
-SAGE_RELEASE_DATE='2024-12-15'
-SAGE_VERSION_BANNER='SageMath version 10.6.beta1, Release Date: 2024-12-15'
+SAGE_VERSION='10.6.beta2'
+SAGE_RELEASE_DATE='2024-12-22'
+SAGE_VERSION_BANNER='SageMath version 10.6.beta2, Release Date: 2024-12-22'