Merge branch 'develop'

.ci/create-changes-html.sh

@@ -62,10 +62,12 @@ for block in diff_blocks:
     match = re.search(r'^diff --git a/(.*) b/\1', block, flags=re.MULTILINE)
     if match:
         doc = match.group(1)
-        path = 'html/' + doc
         file_path = os.path.join('$DOC_REPOSITORY', doc)
-        with open(file_path, 'r') as file:
-            content = file.readlines()
+        try:
+            with open(file_path, 'r') as file:
+                content = file.readlines()
+        except FileNotFoundError:
+            content = []
         count = 0
         for line in block.splitlines():
             if line.startswith('@@ -'):
@@ -77,8 +79,10 @@ for block in diff_blocks:
                             count += 1
                             content[i] = f'<span id="hunk{count}" style="visibility: hidden;"></span>' + content[i]
                             break
-        with open(file_path, 'w') as file:
-            file.writelines(content)
+        if content:
+            with open(file_path, 'w') as file:
+                file.writelines(content)
+        path = 'html/' + doc
         hunks = '&nbsp;'.join(f'<a href="{path}#hunk{i+1}" class="hunk" target="_blank">#{i + 1}</a>' for i in range(count))
         out_blocks.append(f'<p class="diff"><a href="{path}">{doc}</a>&nbsp;' + hunks + '&emsp;</p>'
                             + '\n<pre><code class="language-diff">'

.github/sync_labels.py

@@ -141,6 +141,7 @@ def __init__(self, url, actor):
         self._commits = None
         self._commit_date = None
         self._bot_login = None
+        self._gh_version = None
 
         s = url.split('/')
         self._owner = s[3]
@@ -235,13 +236,30 @@ def bot_login(self):
         """
         if self._bot_login:
             return self._bot_login
-        cmd = 'gh auth status'
         from subprocess import run
+        cmd = 'gh version'
+        capt = run(cmd, shell=True, capture_output=True)
+        self._gh_version = str(capt.stdout).split('\\n')[0]
+        info('version: %s' % self._gh_version)
+        cmd = 'gh auth status'
         capt = run(cmd, shell=True, capture_output=True)
-        l = str(capt.stderr).split()
-        if not 'as' in l:
-            l = str(capt.stdout).split()
-        self._bot_login = l[l.index('as')+1]
+        errtxt = str(capt.stderr)
+        outtxt = str(capt.stdout)
+        debug('auth status err: %s' % errtxt)
+        debug('auth status out: %s' % outtxt)
+        def read_login(txt, position_mark):
+            for t in txt:
+                for p in position_mark:
+                    # the output text has changed from as to account
+                    # around version 2.40.0
+                    l = t.split()
+                    if p in l:
+                        return l[l.index(p)+1]
+        self._bot_login = read_login([errtxt, outtxt], ['account', 'as'])
+        if not self._bot_login:
+            self._bot_login = default_bot
+            warning('Bot is unknown')
+            return self._bot_login
         if self._bot_login.endswith('[bot]'):
             self._bot_login = self._bot_login.split('[bot]')[0]
         info('Bot is %s' % self._bot_login)

.github/workflows/ci-conda-known-test-failures.json

@@ -0,0 +1,53 @@
+{
+    "sage_setup.clean": {
+        "failed": true
+    },
+    "sage.combinat.cluster_algebra_quiver.quiver": {
+        "failed": true
+    },
+    "sage.geometry.cone": {
+        "failed": true
+    },
+    "sage.groups.matrix_gps.finitely_generated_gap": {
+        "failed": true
+    },
+    "sage.interfaces.expect": {
+        "failed": true
+    },
+    "sage.libs.gap.element": {
+        "failed": true
+    },
+    "sage.libs.singular.singular": {
+        "failed": true
+    },
+    "sage.matrix.matrix2": {
+        "failed": true
+    },
+    "sage.matrix.matrix_integer_sparse": {
+        "failed": true
+    },
+    "sage.misc.lazy_import": {
+        "failed": true
+    },
+    "sage.misc.weak_dict": {
+        "failed": true
+    },
+    "sage.modular.modform.l_series_gross_zagier": {
+        "failed": true
+    },
+    "sage.rings.function_field.drinfeld_modules.morphism": {
+        "failed": true
+    },
+    "sage.rings.polynomial.multi_polynomial_ideal": {
+        "failed": true
+    },
+    "sage.rings.polynomial.multi_polynomial_libsingular": {
+        "failed": true
+    },
+    "sage.rings.polynomial.skew_polynomial_finite_field": {
+        "failed": true
+    },
+    "sage.tests.gap_packages": {
+        "failed": true
+    }
+}

.github/workflows/ci-conda.yml

@@ -92,7 +92,7 @@ jobs:
       - name: Test
         if: success() || failure()
         shell: bash -l {0}
-        run: ./sage -t --all -p0
+        run: ./sage -t --all --baseline-stats-path=.github/workflows/ci-conda-known-test-failures.json -p0
 
       - name: Print logs
         if: always()

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.beta2
+version: 10.3.beta3
 doi: 10.5281/zenodo.593563
-date-released: 2023-12-13
+date-released: 2023-12-18
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

README.md

@@ -424,8 +424,8 @@ For installation of `sage` in python using `pip` you need to install `sagemath-s
 
             $ python3 -m pip install sage_conf
             $ ls $(sage-config SAGE_SPKG_WHEELS)
-            $ python3 -m pip install $(sage-config SAGE_SPKG_WHEELS)/*.whl
-            $ python3 -m pip install sagemath-standard
+            $ python3 -m pip install $(sage-config SAGE_SPKG_WHEELS)/*.whl sage_setup
+            $ python3 -m pip install --no-build-isolation sagemath-standard
 
 You need to install `sage_conf`, a wheelhouse of various python packages. You can list the wheels using `ls $(sage-config SAGE_SPKG_WHEELS)`. After manual installation of these wheels, you can install the sage library, `sagemath-standard`.
 

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.3.beta2, Release Date: 2023-12-13
+SageMath version 10.3.beta3, Release Date: 2023-12-18

build/bin/sage-dist-helpers

@@ -289,8 +289,6 @@ sdh_pip_install() {
 
 sdh_pip_editable_install() {
     echo "Installing $PKG_NAME (editable mode)"
-    # Until https://github.com/sagemath/sage/issues/34209 switches us to PEP 660 editable wheels
-    export SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     python3 -m pip install --verbose --no-deps --no-index --no-build-isolation --isolated --editable "$@" || \
         sdh_die "Error installing $PKG_NAME"
 }

build/bin/sage-spkg

@@ -341,7 +341,7 @@ fi
 PKG_BASE_VER=`echo $PKG_VER | sed 's/\.p[0-9][0-9]*$//'`
 if [ -f "$PKG_SCRIPTS/checksums.ini" ]; then
     # Normal/wheel package
-    PKG_NAME_UPSTREAM=`lookup_param tarball "$PKG_SCRIPTS/checksums.ini" | sed "s/VERSION/$PKG_BASE_VER/"`
+    PKG_NAME_UPSTREAM=`lookup_param tarball "$PKG_SCRIPTS/checksums.ini"`
 fi
 
 # Set the $SAGE_DESTDIR variable to be passed to the spkg-install
@@ -396,11 +396,11 @@ ensure_pkg_src() { ###############################################
 if [ ! -f "$PKG_SRC" ]; then
     if [ -n "$PKG_NAME_UPSTREAM" ]; then
         # Normal or wheel package
-        if ! sage-download-file $SAGE_DOWNLOAD_FILE_OPTIONS "$PKG_NAME_UPSTREAM"; then
-            error_msg "Error downloading $PKG_NAME_UPSTREAM"
+        PKG_SRC=$(sage-package download $SAGE_DOWNLOAD_FILE_OPTIONS $PKG_BASE)
+        if [ $? != 0 ]; then
+            error_msg "Error downloading tarball of $PKG_BASE"
             exit 1
         fi
-        PKG_SRC="$SAGE_DISTFILES/$PKG_NAME_UPSTREAM"
         # Do a final check that PKG_SRC is a file with an absolute path
         cd /
         if [ ! -f "$PKG_SRC" ]; then

build/pkgs/4ti2/checksums.ini

@@ -1,5 +1,5 @@
-tarball=4ti2-VERSION.tar.gz
+tarball=4ti2-${VERSION}.tar.gz
 sha1=3d41f30ea3ef94c293eae30c087494269fc1a6b9
 md5=1215872325ddfc561865ecb22b2bccb2
 cksum=2439180289
-upstream_url=https://github.com/4ti2/4ti2/releases/download/Release_1_6_10/4ti2-1.6.10.tar.gz
+upstream_url=https://github.com/4ti2/4ti2/releases/download/Release_${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_MICRO}/4ti2-${VERSION}.tar.gz

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=7f2fe8137f5998559f8d3a0a7f965adf6d5ebc78
-md5=586738771174a2d26d29ce7ba571a95d
-cksum=1156937644
+sha1=2389d2b093493c568deda190ffc326ff2b835169
+md5=545e80b50deb4efa46f14d0a543ba98f
+cksum=169905223

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-2395f7bb45fd7da537a953055df5e0a70dd96c6a
+73e52a419812253c3c3ce72bab7f1a5ddf4c0461

build/pkgs/cunningham_tables/checksums.ini

@@ -2,4 +2,4 @@ tarball=cunningham_tables-VERSION.tar.gz
 sha1=8bea1a113d85bb9c37d8f213dd19525d9d026f22
 md5=e71b32f12e9a46c1c86e275e8441a06b
 cksum=1990403877
-upstream_url=http://users.ox.ac.uk/~coml0531/sage/cunningham_tables-1.0.tar.gz
+upstream_url=http://users.ox.ac.uk/~coml0531/sage/cunningham_tables-VERSION.tar.gz

build/pkgs/cvxopt/spkg-install.in

@@ -82,10 +82,6 @@ sdh_pip_install .
 
 if [ "x$SAGE_SPKG_INSTALL_DOCS" = xyes ] ; then
    cd doc
-   # checking to see if there is previously installed documentation.
-   if [ -d $SAGE_LOCAL/share/doc/cvxopt/html ] ; then
-      rm -rf $SAGE_LOCAL/share/doc/cvxopt/html
-   fi
    mkdir -p "${SAGE_DESTDIR}${SAGE_LOCAL}/share/doc/cvxopt/html"
    cp -r html/* "${SAGE_DESTDIR}${SAGE_LOCAL}/share/doc/cvxopt/html/"
 fi

build/pkgs/eclib/spkg-install.in

@@ -3,17 +3,6 @@ CXXFLAGS="$CXXFLAGS_O3_NON_NATIVE"
 
 export CFLAGS CXXFLAGS
 
-
-echo "Deleting old versions of eclib libraries, which"
-echo "would interfere with new builds..."
-# Delete any pre-autotools libraries:
-rm -f "$SAGE_LOCAL"/lib/lib{curvesntl,g0nntl,jcntl,rankntl,mwrank}.*
-# Delete autotools libraries:
-rm -f "$SAGE_LOCAL"/lib/lib{e,j}c.*
-echo "Deleting old include directory..."
-rm -rf "$SAGE_LOCAL"/include/eclib/
-
-
 cd src/
 
 #############################################################

build/pkgs/ecm/spkg-install.in

@@ -232,17 +232,6 @@ sdh_configure $SAGE_CONFIGURE_GMP $ECM_CONFIGURE
 
 sdh_make
 
-###############################################################################
-# Remove old executable/header/libraries/manpage:
-###############################################################################
-
-echo
-echo "Build succeeded.  Now removing old binary, header file, manual page and libraries..."
-rm -f "$SAGE_LOCAL"/bin/ecm
-rm -f "$SAGE_LOCAL"/lib/libecm.*
-rm -f "$SAGE_LOCAL"/include/ecm.h
-rm -f "$SAGE_LOCAL"/share/man/man1/ecm.1
-
 ###############################################################################
 # Now install ECM:
 ###############################################################################

build/pkgs/fplll/spkg-install.in

@@ -22,7 +22,3 @@ export CXX="$CXX"
 sdh_configure $CONFIGUREFLAGS
 sdh_make
 sdh_make_install
-
-# Pretend that the "libfplll" package is not installed. This is needed to
-# support renaming libfplll -> fplll done on Trac #24042
-rm -f "$SAGE_SPKG_INST/"libfplll-*

build/pkgs/freetype/spkg-install.in

@@ -4,9 +4,3 @@ cd src
 GNUMAKE=${MAKE} sdh_configure --enable-freetype-config $FREETYPE_CONFIGURE
 sdh_make
 sdh_make_install
-
-# The following file may be present from old builds of freetype, and
-# its presence can break the matplotlib build. So remove it. (The
-# current version is $SAGE_LOCAL/include/freetype2/ftbuild.h.)
-
-rm -f "$SAGE_LOCAL/include/ft2build.h"

build/pkgs/frobby/spkg-install.in

@@ -1,4 +1,3 @@
-rm -rf "$SAGE_LOCAL/bin/frobby"
 
 GMP_INC_DIR="$SAGE_LOCAL/include"; export GMP_INC_DIR
 ldflags="-Wl,-rpath,$SAGE_LOCAL/lib -L$SAGE_LOCAL/lib/ -lgmpxx -lgmp"; export ldflags
@@ -12,14 +11,4 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-if [ ! -f bin/release/frobby ]; then
-   echo "Frobby executable not found."
-   exit 1
-fi
-
-$CP bin/release/frobby "$SAGE_LOCAL/bin/"
-
-if [ ! -f "$SAGE_LOCAL/bin/frobby" ]; then
-   echo "Frobby executable not copied."
-   exit 1
-fi
+sdh_install bin/release/frobby "$SAGE_LOCAL/bin"

build/pkgs/frobby/spkg-legacy-uninstall

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+rm -f "$SAGE_LOCAL/bin/frobby"

build/pkgs/gap/distros/debian.txt

@@ -1 +1,2 @@
+gap
 libgap-dev

build/pkgs/gap/distros/fedora.txt

@@ -0,0 +1,5 @@
+gap
+gap-core
+gap-devel
+gap-libs
+libgap