Merge remote-tracking branch 'sagemath/develop' into use-pari-zncoppe…

…rsmith

.devcontainer/onCreate-conda.sh

@@ -10,5 +10,4 @@ mamba env create -y --file environment-3.11-linux.yml || mamba env update -y --f
 conda init bash
 
 # Build sage
-conda run -n sage-dev ./bootstrap
-conda run -n sage-dev pip install --no-build-isolation -v -v -e ./src
+conda run -n sage-dev pip install --no-build-isolation -v -v -e .

.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
@@ -69,11 +69,23 @@ jobs:
           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
+          # 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: Verify dependencies
+        shell: bash -l {0}
+        run: pip check
 
       - 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
+
+      - name: Upload log
+        uses: actions/[email protected]
+        if: failure()
+        with:
+          name: ${{ runner.os }}-meson-${{ matrix.python }}-log
+          path: builddir/meson-logs/

.github/workflows/dist.yml

@@ -119,10 +119,36 @@ jobs:
         with:
           name: dist
           path: dist
-      - uses: softprops/action-gh-release@v2
+      - name: Create release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          latest_release_tag=$(curl -s https://api.github.com/repos/${{ github.repository }}/releases \
+          | jq -r 'sort_by(.created_at) | last(.[]).tag_name')
+          release_notes=$(curl -s \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer $GITHUB_TOKEN" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/${{ github.repository }}/releases/generate-notes \
+            -d "{
+              \"tag_name\": \"${{ github.ref_name }}\",
+              \"previous_tag_name\": \"$latest_release_tag\"
+            }" | jq -r '.body')
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer $GITHUB_TOKEN" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/${{ github.repository }}/releases \
+            -d "{
+              \"tag_name\": \"${{ github.ref_name }}\",
+              \"prerelease\": ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }},
+              \"body\": \"$release_notes\"
+            }"
+      - name: Create release assets
+        uses: softprops/action-gh-release@v2
         with:
-          generate_release_notes: true
-          prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
           files: |
             dist/*
             upstream/*

.gitignore

@@ -18,7 +18,6 @@
 /config.log
 /config.status
 /configure
-/conftest*
 /confdefs.h
 
 /m4/sage_spkg_configures.m4

.vscode/settings.json

@@ -18,9 +18,7 @@
     },
     "python.testing.pytestEnabled": true,
     "python.testing.pytestArgs": [
-        "--rootdir=src/sage",
-        "-c=src/tox.ini",
-        "--doctest-modules"
+        "--doctest"
     ],
     "python.testing.unittestEnabled": false,
     "cSpell.words": [

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.beta3
 doi: 10.5281/zenodo.8042260
-date-released: 2024-12-15
+date-released: 2025-01-04
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

README.md

@@ -679,7 +679,7 @@ information, patches, and build scripts are in the accompanying
 part of the Sage git repository.
 
 <p align="center">
-   Copyright (C) 2005-2024 The Sage Development Team
+   Copyright (C) 2005-2025 The Sage Development Team
 </p>
 <p align="center">
    https://www.sagemath.org

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.6.beta1, Release Date: 2024-12-15
+SageMath version 10.6.beta3, Release Date: 2025-01-04

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=852d0d200a6a73aa5ddb9e00874cbe4a61c211e9
+sha256=c4b089d90850dfdf15b905f66e4f6a0d961b96eb0663d8603beaff1a9efb2cbe

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-a72ae6d615ddfd3e49b36c200aaf14c24a265916
+a2ba1f943f88775218c385efe55509c4548d1b44

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.6b3

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.6b3

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.6b3

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.6b3