Merge branch 'develop' into flats_matroid

Author: gmou3

.github/workflows/ci-linux.yml

@@ -39,6 +39,7 @@ jobs:
     uses: ./.github/workflows/docker.yml
     with:
       # Build from scratch
+      free_disk_space: true
       docker_targets: "with-system-packages configured with-targets-pre with-targets"
       # FIXME: duplicated from env.TARGETS
       targets_pre: all-sage-local

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
 doi: 10.5281/zenodo.593563
-date-released: 2024-02-29
+date-released: 2024-03-19
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.3.rc1, Release Date: 2024-02-29
+SageMath version 10.3, Release Date: 2024-03-19

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=:
+                    ])
                 ])
             ])
         ])

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=b0dfc1d5886366b5c58354527810c1dbeffd78a3
-md5=c2f9837bcf2823d5b2f36063ebeedb38
-cksum=3535625335
+sha1=f4a7dd60c09ac2f3e1f8e388cbf2a527dcd5547c
+md5=c16cb118d9ad6a495f6c5d509b2ec570
+cksum=3417350968

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-686e933eb32ade977ed51836a33424e2095e5408
+ab1a517b64b02bf15bbcb8d7c2d4d643bd5eff9b

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

build/pkgs/h11/SPKG.rst

@@ -0,0 +1,5 @@
+tarball=h11-VERSION-py3-none-any.whl
+sha1=c502d56dc3288212142a398704a5109749331dd8
+md5=47f19bfed53c8f9278749c532490977e
+cksum=462065947
+upstream_url=https://pypi.io/packages/py3/h/h11/h11-VERSION-py3-none-any.whl

build/pkgs/h11/checksums.ini

@@ -0,0 +1,4 @@
+ | $(PYTHON_TOOLCHAIN) $(PYTHON)
+
+----------
+All lines of this file are ignored except the first.