Skip to content

Commit 1e66857

Browse files
mantepsemantepse
authored
Merge branch 'sagemath:develop' into matrix/solve_modn
2 parents db92607 + cb8e15b commit 1e66857

File tree

41 files changed

+94
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+94
-71
lines changed

‎CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title: SageMath
44
abstract: SageMath is a free open-source mathematics software system.
55
authors:
66
- name: "The SageMath Developers"
7-
version: 10.3.rc1
7+
version: 10.3.rc2
88
doi: 10.5281/zenodo.593563
9-
date-released: 2024-02-29
9+
date-released: 2024-03-04
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

‎VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.3.rc1, Release Date: 2024-02-29
1+
SageMath version 10.3.rc2, Release Date: 2024-03-04

‎build/pkgs/cmake/spkg-configure.m4

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
SAGE_SPKG_CONFIGURE(
2-
[cmake], [
3-
AC_CACHE_CHECK([for cmake >= 3.11], [ac_cv_path_CMAKE], [
4-
AC_PATH_PROGS_FEATURE_CHECK([CMAKE], [cmake], [
5-
cmake_version=`$ac_path_CMAKE --version 2>&1 \
6-
| $SED -n -e 's/cmake version *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
7-
AS_IF([test -n "$cmake_version"], [
8-
AX_COMPARE_VERSION([$cmake_version], [ge], [3.11], [
9-
ac_cv_path_CMAKE="$ac_path_CMAKE"
10-
ac_path_CMAKE_found=:
1+
SAGE_SPKG_CONFIGURE([cmake], [dnl
2+
AC_CACHE_CHECK([for cmake >= 3.11], [ac_cv_path_CMAKE], [dnl
3+
dnl Do not accept cmake installed via https://pypi.org/project/cmake/
4+
dnl in the default user scheme; it will not work in our venv because
5+
dnl we set PYTHONUSERBASE in sage-env.
6+
WITH_SAGE_PYTHONUSERBASE([dnl
7+
AC_PATH_PROGS_FEATURE_CHECK([CMAKE], [cmake], [dnl
8+
cmake_version=`$ac_path_CMAKE --version 2>&1 \
9+
| $SED -n -e 's/cmake version *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
10+
AS_IF([test -n "$cmake_version"], [dnl
11+
AX_COMPARE_VERSION([$cmake_version], [ge], [3.11], [dnl
12+
ac_cv_path_CMAKE="$ac_path_CMAKE"
13+
ac_path_CMAKE_found=:
14+
])
1115
])
1216
])
1317
])

‎build/pkgs/configure/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=b0dfc1d5886366b5c58354527810c1dbeffd78a3
3-
md5=c2f9837bcf2823d5b2f36063ebeedb38
4-
cksum=3535625335
2+
sha1=ff35813eb1168b754ab9470066b39aeaca9d462c
3+
md5=834bc382880b0cfea48fa00bdff79534
4+
cksum=4002007446

‎build/pkgs/configure/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
686e933eb32ade977ed51836a33424e2095e5408
1+
872ca39ec422cacd1005dd6b1ccd9737d5d88712

‎build/pkgs/flint/spkg-configure.m4

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
11
SAGE_SPKG_CONFIGURE([flint], [
22
SAGE_SPKG_DEPCHECK([mpfr], [
3-
AC_CHECK_HEADER(flint/flint.h, [
3+
AC_CHECK_HEADER(flint/flint.h, [dnl
44
dnl gr_get_fexpr appears in Flint 3.0
5-
AC_SEARCH_LIBS([gr_get_fexpr], [flint], [], [sage_spkg_install_flint=yes])
5+
AC_SEARCH_LIBS([gr_get_fexpr], [flint], [dnl
6+
dnl Flint 3.1 is too new
7+
AC_MSG_CHECKING([whether FLINT version is >= 3.1.0])
8+
AC_COMPILE_IFELSE([dnl
9+
AC_LANG_PROGRAM([[#include <flint/flint.h>
10+
#if __FLINT_RELEASE >= 30100
11+
# error "FLINT 3.1 is too new"
12+
#endif
13+
]])
14+
], [dnl
15+
AC_MSG_RESULT([no])
16+
], [dnl
17+
AC_MSG_RESULT([yes; too new])
18+
sage_spkg_install_flint=yes
19+
])
20+
], [sage_spkg_install_flint=yes])
621
], [sage_spkg_install_flint=yes])
722
])
8-
], [], [], [
23+
], [], [], [dnl
924
if test x$sage_spkg_install_flint = xyes; then
1025
AC_SUBST(SAGE_FLINT_PREFIX, ['$SAGE_LOCAL'])
1126
else

‎build/pkgs/ninja_build/spkg-configure.m4

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
SAGE_SPKG_CONFIGURE(
2-
[ninja_build], [
3-
dnl meson_python needs 1.8.2 or later
4-
AC_CACHE_CHECK([for ninja >= 1.8.2], [ac_cv_path_NINJA], [
5-
AC_PATH_PROGS_FEATURE_CHECK([NINJA], [ninja], [
6-
dnl support both two- and three-component version schemes
7-
dnl since samurai (a ninja alternative) uses two
8-
ninja_version=`$ac_path_NINJA --version 2>&1 \
9-
| $SED -n -e 's/\([[0-9]]*\(\.[[0-9]]*\)\{1,2\}\).*/\1/p'`
10-
AS_IF([test -n "$ninja_version"], [
11-
AX_COMPARE_VERSION([$ninja_version], [ge], [1.8.2], [
12-
ac_cv_path_NINJA="$ac_path_NINJA"
13-
ac_path_NINJA_found=:
1+
SAGE_SPKG_CONFIGURE([ninja_build], [dnl
2+
dnl meson_python needs 1.8.2 or later
3+
AC_CACHE_CHECK([for ninja >= 1.8.2], [ac_cv_path_NINJA], [dnl
4+
dnl Do not accept ninja installed from https://pypi.org/project/ninja/
5+
dnl in the default user scheme; it will not work in our venv because
6+
dnl we set PYTHONUSERBASE in sage-env.
7+
WITH_SAGE_PYTHONUSERBASE([dnl
8+
AC_PATH_PROGS_FEATURE_CHECK([NINJA], [ninja], [dnl
9+
dnl support both two- and three-component version schemes
10+
dnl since samurai (a ninja alternative) uses two
11+
ninja_version=`$ac_path_NINJA --version 2>&1 \
12+
| $SED -n -e 's/\([[0-9]]*\(\.[[0-9]]*\)\{1,2\}\).*/\1/p'`
13+
AS_IF([test -n "$ninja_version"], [dnl
14+
AX_COMPARE_VERSION([$ninja_version], [ge], [1.8.2], [
15+
ac_cv_path_NINJA="$ac_path_NINJA"
16+
ac_path_NINJA_found=:
17+
])
1418
])
1519
])
1620
])

‎build/pkgs/sage_conf/install-requires.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-conf ~= 10.3rc1
2+
sage-conf ~= 10.3rc2

‎build/pkgs/sage_docbuild/install-requires.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-docbuild ~= 10.3rc1
2+
sage-docbuild ~= 10.3rc2

‎build/pkgs/sage_setup/install-requires.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-setup ~= 10.3rc1
2+
sage-setup ~= 10.3rc2

0 commit comments

Comments
 (0)