Merge branch 'sagemath:develop' into databases/findstat

sagemath · Mar 6, 2024 · e5d6f95 · e5d6f95
2 parents f64da02 + cb8e15b
commit e5d6f95
Show file tree

Hide file tree

Showing 41 changed files with 94 additions and 71 deletions.
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.3.rc1
+version: 10.3.rc2
 doi: 10.5281/zenodo.593563
-date-released: 2024-02-29
+date-released: 2024-03-04
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 10.3.rc1, Release Date: 2024-02-29
+SageMath version 10.3.rc2, Release Date: 2024-03-04
diff --git a/build/pkgs/cmake/spkg-configure.m4 b/build/pkgs/cmake/spkg-configure.m4
@@ -1,13 +1,17 @@
-SAGE_SPKG_CONFIGURE(
- [cmake], [
- AC_CACHE_CHECK([for cmake >= 3.11], [ac_cv_path_CMAKE], [
- AC_PATH_PROGS_FEATURE_CHECK([CMAKE], [cmake], [
- cmake_version=`$ac_path_CMAKE --version 2>&1 \
- | $SED -n -e 's/cmake version *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
- AS_IF([test -n "$cmake_version"], [
- AX_COMPARE_VERSION([$cmake_version], [ge], [3.11], [
- ac_cv_path_CMAKE="$ac_path_CMAKE"
- ac_path_CMAKE_found=:
+SAGE_SPKG_CONFIGURE([cmake], [dnl
+ AC_CACHE_CHECK([for cmake >= 3.11], [ac_cv_path_CMAKE], [dnl
+ dnl Do not accept cmake installed via https://pypi.org/project/cmake/
+ dnl in the default user scheme; it will not work in our venv because
+ dnl we set PYTHONUSERBASE in sage-env.
+ WITH_SAGE_PYTHONUSERBASE([dnl
+ AC_PATH_PROGS_FEATURE_CHECK([CMAKE], [cmake], [dnl
+ cmake_version=`$ac_path_CMAKE --version 2>&1 \
+ | $SED -n -e 's/cmake version *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
+ AS_IF([test -n "$cmake_version"], [dnl
+ AX_COMPARE_VERSION([$cmake_version], [ge], [3.11], [dnl
+ ac_cv_path_CMAKE="$ac_path_CMAKE"
+ ac_path_CMAKE_found=:
+ ])
  ])
  ])
  ])

diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=b0dfc1d5886366b5c58354527810c1dbeffd78a3
-md5=c2f9837bcf2823d5b2f36063ebeedb38
-cksum=3535625335
+sha1=ff35813eb1168b754ab9470066b39aeaca9d462c
+md5=834bc382880b0cfea48fa00bdff79534
+cksum=4002007446
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-686e933eb32ade977ed51836a33424e2095e5408
+872ca39ec422cacd1005dd6b1ccd9737d5d88712
diff --git a/build/pkgs/flint/spkg-configure.m4 b/build/pkgs/flint/spkg-configure.m4
@@ -1,11 +1,26 @@
 SAGE_SPKG_CONFIGURE([flint], [
  SAGE_SPKG_DEPCHECK([mpfr], [
- AC_CHECK_HEADER(flint/flint.h, [
+ AC_CHECK_HEADER(flint/flint.h, [dnl
  dnl gr_get_fexpr appears in Flint 3.0
- AC_SEARCH_LIBS([gr_get_fexpr], [flint], [], [sage_spkg_install_flint=yes])
+ AC_SEARCH_LIBS([gr_get_fexpr], [flint], [dnl
+ dnl Flint 3.1 is too new
+ AC_MSG_CHECKING([whether FLINT version is >= 3.1.0])
+ AC_COMPILE_IFELSE([dnl
+ AC_LANG_PROGRAM([[#include <flint/flint.h>
+ #if __FLINT_RELEASE >= 30100
+ # error "FLINT 3.1 is too new"
+ #endif
+ ]])
+ ], [dnl
+ AC_MSG_RESULT([no])
+ ], [dnl
+ AC_MSG_RESULT([yes; too new])
+ sage_spkg_install_flint=yes
+ ])
+ ], [sage_spkg_install_flint=yes])
  ], [sage_spkg_install_flint=yes])
  ])
-], [], [], [
+], [], [], [dnl
  if test x$sage_spkg_install_flint = xyes; then
  AC_SUBST(SAGE_FLINT_PREFIX, ['$SAGE_LOCAL'])
  else

diff --git a/build/pkgs/ninja_build/spkg-configure.m4 b/build/pkgs/ninja_build/spkg-configure.m4
@@ -1,16 +1,20 @@
-SAGE_SPKG_CONFIGURE(
- [ninja_build], [
- dnl meson_python needs 1.8.2 or later
- AC_CACHE_CHECK([for ninja >= 1.8.2], [ac_cv_path_NINJA], [
- AC_PATH_PROGS_FEATURE_CHECK([NINJA], [ninja], [
- dnl support both two- and three-component version schemes
- dnl since samurai (a ninja alternative) uses two
- ninja_version=`$ac_path_NINJA --version 2>&1 \
- | $SED -n -e 's/\([[0-9]]*\(\.[[0-9]]*\)\{1,2\}\).*/\1/p'`
- AS_IF([test -n "$ninja_version"], [
- AX_COMPARE_VERSION([$ninja_version], [ge], [1.8.2], [
- ac_cv_path_NINJA="$ac_path_NINJA"
- ac_path_NINJA_found=:
+SAGE_SPKG_CONFIGURE([ninja_build], [dnl
+ dnl meson_python needs 1.8.2 or later
+ AC_CACHE_CHECK([for ninja >= 1.8.2], [ac_cv_path_NINJA], [dnl
+ dnl Do not accept ninja installed from https://pypi.org/project/ninja/
+ dnl in the default user scheme; it will not work in our venv because
+ dnl we set PYTHONUSERBASE in sage-env.
+ WITH_SAGE_PYTHONUSERBASE([dnl
+ AC_PATH_PROGS_FEATURE_CHECK([NINJA], [ninja], [dnl
+ dnl support both two- and three-component version schemes
+ dnl since samurai (a ninja alternative) uses two
+ ninja_version=`$ac_path_NINJA --version 2>&1 \
+ | $SED -n -e 's/\([[0-9]]*\(\.[[0-9]]*\)\{1,2\}\).*/\1/p'`
+ AS_IF([test -n "$ninja_version"], [dnl
+ AX_COMPARE_VERSION([$ninja_version], [ge], [1.8.2], [
+ ac_cv_path_NINJA="$ac_path_NINJA"
+ ac_path_NINJA_found=:
+ ])
  ])
  ])
  ])

diff --git a/build/pkgs/sage_conf/install-requires.txt b/build/pkgs/sage_conf/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-conf ~= 10.3rc1
+sage-conf ~= 10.3rc2
diff --git a/build/pkgs/sage_docbuild/install-requires.txt b/build/pkgs/sage_docbuild/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-docbuild ~= 10.3rc1
+sage-docbuild ~= 10.3rc2
diff --git a/build/pkgs/sage_setup/install-requires.txt b/build/pkgs/sage_setup/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-setup ~= 10.3rc1
+sage-setup ~= 10.3rc2
diff --git a/build/pkgs/sage_sws2rst/install-requires.txt b/build/pkgs/sage_sws2rst/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-sws2rst ~= 10.3rc1
+sage-sws2rst ~= 10.3rc2
diff --git a/build/pkgs/sagelib/install-requires.txt b/build/pkgs/sagelib/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-standard ~= 10.3rc1
+sagemath-standard ~= 10.3rc2
diff --git a/build/pkgs/sagemath_bliss/install-requires.txt b/build/pkgs/sagemath_bliss/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-bliss ~= 10.3rc1
+sagemath-bliss ~= 10.3rc2
diff --git a/build/pkgs/sagemath_categories/install-requires.txt b/build/pkgs/sagemath_categories/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-categories ~= 10.3rc1
+sagemath-categories ~= 10.3rc2
diff --git a/build/pkgs/sagemath_coxeter3/install-requires.txt b/build/pkgs/sagemath_coxeter3/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-coxeter3 ~= 10.3rc1
+sagemath-coxeter3 ~= 10.3rc2
diff --git a/build/pkgs/sagemath_environment/install-requires.txt b/build/pkgs/sagemath_environment/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-environment ~= 10.3rc1
+sagemath-environment ~= 10.3rc2
diff --git a/build/pkgs/sagemath_mcqd/install-requires.txt b/build/pkgs/sagemath_mcqd/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-mcqd ~= 10.3rc1
+sagemath-mcqd ~= 10.3rc2
diff --git a/build/pkgs/sagemath_meataxe/install-requires.txt b/build/pkgs/sagemath_meataxe/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-meataxe ~= 10.3rc1
+sagemath-meataxe ~= 10.3rc2
diff --git a/build/pkgs/sagemath_objects/install-requires.txt b/build/pkgs/sagemath_objects/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-objects ~= 10.3rc1
+sagemath-objects ~= 10.3rc2
diff --git a/build/pkgs/sagemath_repl/install-requires.txt b/build/pkgs/sagemath_repl/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-repl ~= 10.3rc1
+sagemath-repl ~= 10.3rc2
diff --git a/build/pkgs/sagemath_sirocco/install-requires.txt b/build/pkgs/sagemath_sirocco/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-sirocco ~= 10.3rc1
+sagemath-sirocco ~= 10.3rc2
diff --git a/build/pkgs/sagemath_tdlib/install-requires.txt b/build/pkgs/sagemath_tdlib/install-requires.txt
@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-tdlib ~= 10.3rc1
+sagemath-tdlib ~= 10.3rc2
diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sage-conf_conda/VERSION.txt b/pkgs/sage-conf_conda/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
diff --git a/src/VERSION.txt b/src/VERSION.txt
@@ -1 +1 @@
-10.3.rc1
+10.3.rc2
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 sage-update-version script, do not edit!
-SAGE_VERSION='10.3.rc1'
-SAGE_RELEASE_DATE='2024-02-29'
-SAGE_VERSION_BANNER='SageMath version 10.3.rc1, Release Date: 2024-02-29'
+SAGE_VERSION='10.3.rc2'
+SAGE_RELEASE_DATE='2024-03-04'
+SAGE_VERSION_BANNER='SageMath version 10.3.rc2, Release Date: 2024-03-04'
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 sage-update-version script, do not edit!
-version = '10.3.rc1'
-date = '2024-02-29'
-banner = 'SageMath version 10.3.rc1, Release Date: 2024-02-29'
+version = '10.3.rc2'
+date = '2024-03-04'
+banner = 'SageMath version 10.3.rc2, Release Date: 2024-03-04'