Merge remote-tracking branch 'upstream/develop' into distro-meson

tobiasdiez · tobiasdiez · commit 2e32a7aa29a9 · 2025-08-10T11:23:54.000+08:00
diff --git a/CITATION.cff b/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.7.rc0
+version: 10.7
 doi: 10.5281/zenodo.8042260
-date-released: 2025-08-02
+date-released: 2025-08-09
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=eb43008c539589aa31cdb6ec98b47a2c43c60486
-sha256=3f7b71621144bf2c62983c5276e00fe941e2be8f33005ae4594c269b71bccd1b
+sha1=60867f7d62984944eca465d48e0fb31abde2841e
+sha256=4ec557fb0516afe91e097986429d4e1c65e035cee5b9a8f21b17d3c1db9212d7
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-1e5e8e6b859ca8064b05738793074b5695012653
+858268b40010e5ed6da13488ad0f52cda4d1f70e
diff --git a/build/pkgs/gap_packages/spkg-install.in b/build/pkgs/gap_packages/spkg-install.in
@@ -92,7 +92,7 @@ install_compiled_pkg()
 #
 # These packages have an old ./configure that take the GAP_ROOT as a positional
 # argument
-for pkg in cohomolo crypting grape guava orb datastructures
+for pkg in cohomolo crypting grape orb datastructures
 do
     echo "Building GAP package $pkg"
     CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
@@ -104,6 +104,14 @@ do
     cd "$PKG_SRC_DIR"
 done
 
+echo "Building GAP package guava"
+export CFLAGS="-std=gnu17 $CFLAGS -Wno-implicit-function-declaration"
+cd "$PKG_SRC_DIR/guava"
+./configure "$GAP_ROOT"
+sdh_make
+install_compiled_pkg "guava"
+cd "$PKG_SRC_DIR"
+
 # These packages have a new-style autoconf ./configure
 # that takes --with-gaproot
 
diff --git a/build/pkgs/gp2c/checksums.ini b/build/pkgs/gp2c/checksums.ini
@@ -1,3 +1,4 @@
 tarball=gp2c-VERSION.tar.gz
-sha1=6bce2bbb69227de44fa768619d1dffa861d6470a
-sha256=e0f89183ae4ea24fc41e1da3df3cca11e4f7061237cee0553082c7806ef917f6
+sha1=8da45efa235f23d3cb2456ed6bef5b6f3b747aeb
+sha256=af6112cc02940457e239da4433d1a0d8da60eeef29f7cc722f64cd4ac00b7b30
+upstream_url=https://pari.math.u-bordeaux.fr/pub/pari/GP2C/gp2c-VERSION.tar.gz
diff --git a/build/pkgs/gp2c/package-version.txt b/build/pkgs/gp2c/package-version.txt
@@ -1 +1 @@
-0.0.10.p0
+0.0.14
diff --git a/build/pkgs/qhull/patches/qhull_cmake.patch b/build/pkgs/qhull/patches/qhull_cmake.patch
@@ -0,0 +1,22 @@
+*** src/CMakeLists.txt.orig	Thu May  8 13:21:24 2025
+--- src/CMakeLists.txt	Thu May  8 13:25:39 2025
+***************
+*** 67,74 ****
+  # $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $
+  # $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $
+
+  project(qhull)
+- cmake_minimum_required(VERSION 3.0)
+
+  # Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt
+  #   qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm
+--- 67,75 ----
+  # $Id: //main/2019/qhull/CMakeLists.txt#21 $$Change: 3039 $
+  # $DateTime: 2020/09/03 21:26:22 $$Author: bbarber $
+
++ cmake_minimum_required(VERSION 3.25...4.0.3)
++
+  project(qhull)
+
+  # Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt
+  #   qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm
diff --git a/build/pkgs/sage_conf/version_requirements.txt b/build/pkgs/sage_conf/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sage-conf ~= 10.7rc0
+sage-conf ~= 10.7
diff --git a/build/pkgs/sage_docbuild/version_requirements.txt b/build/pkgs/sage_docbuild/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sage-docbuild ~= 10.7rc0
+sage-docbuild ~= 10.7
diff --git a/build/pkgs/sage_setup/version_requirements.txt b/build/pkgs/sage_setup/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sage-setup ~= 10.7rc0
+sage-setup ~= 10.7
diff --git a/build/pkgs/sagelib/version_requirements.txt b/build/pkgs/sagelib/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-standard ~= 10.7rc0
+sagemath-standard ~= 10.7
diff --git a/build/pkgs/sagemath_bliss/version_requirements.txt b/build/pkgs/sagemath_bliss/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-bliss ~= 10.7rc0
+sagemath-bliss ~= 10.7
diff --git a/build/pkgs/sagemath_categories/version_requirements.txt b/build/pkgs/sagemath_categories/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-categories ~= 10.7rc0
+sagemath-categories ~= 10.7
diff --git a/build/pkgs/sagemath_coxeter3/version_requirements.txt b/build/pkgs/sagemath_coxeter3/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-coxeter3 ~= 10.7rc0
+sagemath-coxeter3 ~= 10.7
diff --git a/build/pkgs/sagemath_environment/version_requirements.txt b/build/pkgs/sagemath_environment/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-environment ~= 10.7rc0
+sagemath-environment ~= 10.7
diff --git a/build/pkgs/sagemath_mcqd/version_requirements.txt b/build/pkgs/sagemath_mcqd/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-mcqd ~= 10.7rc0
+sagemath-mcqd ~= 10.7
diff --git a/build/pkgs/sagemath_meataxe/version_requirements.txt b/build/pkgs/sagemath_meataxe/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-meataxe ~= 10.7rc0
+sagemath-meataxe ~= 10.7
diff --git a/build/pkgs/sagemath_objects/version_requirements.txt b/build/pkgs/sagemath_objects/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-objects ~= 10.7rc0
+sagemath-objects ~= 10.7
diff --git a/build/pkgs/sagemath_repl/version_requirements.txt b/build/pkgs/sagemath_repl/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-repl ~= 10.7rc0
+sagemath-repl ~= 10.7
diff --git a/build/pkgs/sagemath_sirocco/version_requirements.txt b/build/pkgs/sagemath_sirocco/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-sirocco ~= 10.7rc0
+sagemath-sirocco ~= 10.7
diff --git a/build/pkgs/sagemath_tdlib/version_requirements.txt b/build/pkgs/sagemath_tdlib/version_requirements.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the update-version script
-sagemath-tdlib ~= 10.7rc0
+sagemath-tdlib ~= 10.7
diff --git a/build/pkgs/symengine/checksums.ini b/build/pkgs/symengine/checksums.ini
@@ -1,4 +1,4 @@
 tarball=symengine-VERSION.tar.gz
-sha1=2dfee07108509963f3dbe3d9cad9de76d85e551f
-sha256=f6972acd6a65354f6414e69460d2e175729470632bdac05919bc2f7f32e48cbd
+sha1=e53aa2677bcad5a5dc075a94d4a4f9ef95b5fe07
+sha256=11c5f64e9eec998152437f288b8429ec001168277d55f3f5f1df78e3cf129707
 upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz
diff --git a/build/pkgs/symengine/package-version.txt b/build/pkgs/symengine/package-version.txt
@@ -1 +1 @@
-0.11.2
+0.14.0
diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-environment/pyproject.toml.m4 b/pkgs/sagemath-environment/pyproject.toml.m4
@@ -47,8 +47,6 @@ script-files = [
     "bin/sage-num-threads.py",
     "bin/sage-venv-config",
     "bin/sage-version.sh",
-    # Auxiliary script for invoking Python in the Sage environment
-    "bin/sage-python",
     # Not included:
     # - bin/sage-env-config                  -- installed by sage_conf
     # - bin/sage-env-config.in               -- not to be installed
diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt
@@ -1 +1 @@
-10.7.rc0
+10.7
diff --git a/src/bin/sage-version.sh b/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 update-version script, do not edit!
-SAGE_VERSION='10.7.rc0'
-SAGE_RELEASE_DATE='2025-08-02'
-SAGE_VERSION_BANNER='SageMath version 10.7.rc0, Release Date: 2025-08-02'
+SAGE_VERSION='10.7'
+SAGE_RELEASE_DATE='2025-08-09'
+SAGE_VERSION_BANNER='SageMath version 10.7, Release Date: 2025-08-09'
diff --git a/src/doc/en/website/versions.txt b/src/doc/en/website/versions.txt
@@ -7,6 +7,7 @@
 # The update-version script adds a new line for a new stable release
 # when run by the Sage release manager to prepare a new release
 #
+10.7 doc-10-7--sagemath.netlify.app
 10.6 doc-10-6--sagemath.netlify.app
 10.5 doc-10-5--sagemath.netlify.app
 10.4 doc-10-4--sagemath.netlify.app
@@ -16,4 +17,3 @@
 10.0 doc-10-0--sagemath.netlify.app
 9.8 doc-9-8--sagemath.netlify.app
 9.7 doc-9-7--sagemath.netlify.app
-9.6 doc-9-6--sagemath.netlify.app
diff --git a/src/sage/version.py b/src/sage/version.py
@@ -1,5 +1,5 @@
 # Sage version information for Python scripts
 # This file is auto-generated by the update-version script, do not edit!
-version = '10.7.rc0'
-date = '2025-08-02'
-banner = 'SageMath version 10.7.rc0, Release Date: 2025-08-02'
+version = '10.7'
+date = '2025-08-09'
+banner = 'SageMath version 10.7, Release Date: 2025-08-09'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-1e5e8e6b859ca8064b05738793074b5695012653`
	`1`	`+858268b40010e5ed6da13488ad0f52cda4d1f70e`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# This file is updated on every release by the update-version script`
`2`		`-sage-conf ~= 10.7rc0`
	`2`	`+sage-conf ~= 10.7`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# This file is updated on every release by the update-version script`
`2`		`-sage-docbuild ~= 10.7rc0`
	`2`	`+sage-docbuild ~= 10.7`