Merge branch 'develop' into pariell

sagemath · Jun 1, 2023 · 3c904ff · 3c904ff
2 parents 49e968a + 3202f65
commit 3c904ff
Show file tree

Hide file tree

Showing 702 changed files with 34,635 additions and 27,961 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,6 +3,9 @@ name: Build & Test
 on:
   pull_request:
   push:
+    branches: ['**']
+    # Ignore pushes on tags to prevent two uploads of codecov reports
+    tags-ignore: ['**']
   workflow_dispatch:
     # Allow to run manually
     inputs:
@@ -91,7 +94,7 @@ jobs:
         if: always() && steps.build.outcome == 'success'
         run: |
           ../sage -python -m pip install coverage
-          ../sage -python -m coverage run ./bin/sage-runtests --all -p2
+          ../sage -python -m coverage run ./bin/sage-runtests --all -p2 --random-seed=286735480429121101562228604801325644303
         working-directory: ./src
 
       - name: Prepare coverage results

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -29,6 +29,9 @@ env:
   TARGETS: build doc-html
   TARGETS_OPTIONAL: ptest
 
+permissions:
+  packages: write
+
 jobs:
 
   standard-pre:

diff --git a/.github/workflows/doc-publish.yml b/.github/workflows/doc-publish.yml
@@ -1,4 +1,4 @@
-# Triggers after the documentation build has finished, 
+# Triggers after the documentation build has finished,
 # taking the artifact and uploading it to netlify
 name: Publish documentation
 
@@ -47,7 +47,7 @@ jobs:
             });
             var fs = require('fs');
             fs.writeFileSync('${{github.workspace}}/docs.zip', Buffer.from(download.data));
-      
+
       - name: Extract docs
         run: unzip docs.zip -d docs && unzip docs/docs.zip -d docs/docs
 
@@ -72,9 +72,8 @@ jobs:
           header: preview-comment
           recreate: true
           message: |
-            [Documentation preview for this PR](${{ steps.deploy-netlify.outputs.NETLIFY_URL }}) is ready! :tada:
-            Built with commit: ${{ steps.source-run-info.outputs.sourceHeadSha }}
-      
+            [Documentation preview for this PR](${{ steps.deploy-netlify.outputs.NETLIFY_URL }}) (built with commit ${{ steps.source-run-info.outputs.sourceHeadSha }}) is ready! :tada:
+
       - name: Update deployment status PR check
         uses: myrotvorets/[email protected]
         if: ${{ always() }}

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -147,8 +147,6 @@ jobs:
           repository: ${{ inputs.sage_repo }}
           ref: ${{ inputs.sage_ref }}
           fetch-depth: 10000
-      - name: fetch tags
-        run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: free disk space
         run: |
           df -h

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -27,7 +27,7 @@
     "python.linting.enabled": true,
     // The following pycodestyle arguments are the same as the pycodestyle-minimal
     // tox environnment, see the file SAGE_ROOT/src/tox.ini
-    "python.linting.pycodestyleArgs": ["--select=E111,E306,E401,E701,E702,E703,W291,W391,W605,E711,E712,E713,E721,E722"],
+    "python.linting.pycodestyleArgs": ["--select= E111,E211,E271,E303,E306,E401,E502,E701,E702,E703,E714,W291,W293,W391,W605,E711,E712,E713,E721,E722"],
     "cSpell.words": [
         "furo",
         "Conda",

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 10.0.rc2", 
-    "version": "10.0.rc2", 
+    "title": "sagemath/sage: 10.1.beta1", 
+    "version": "10.1.beta1", 
     "upload_type": "software", 
-    "publication_date": "2023-05-07", 
+    "publication_date": "2023-05-28", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/10.0.rc2", 
+            "identifier": "https://github.com/sagemath/sage/tree/10.1.beta1", 
             "relation": "isSupplementTo"
         }, 
         {

diff --git a/README.md b/README.md
@@ -58,9 +58,11 @@ mailing list](https://groups.google.com/group/sage-devel).
 --------------------------------
 
 The preferred way to run Sage on Windows is using the [Windows Subsystem for
-Linux](https://docs.microsoft.com/en-us/windows/wsl/faq), which allows
+Linux](https://docs.microsoft.com/en-us/windows/wsl/faq), a.k.a. WSL, which allows
 you to install a standard Linux distribution such as Ubuntu within
-your Windows.  Then all instructions for installation in Linux apply.
+your Windows. Make sure you allocate WSL sufficient RAM; 5GB is known to work, while
+2GB might be not enough for building Sage from source. 
+Then all instructions for installation in Linux apply.
 
 As an alternative, you can also run Linux on Windows using Docker (see
 above) or other virtualization solutions.

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 10.0.rc2, Release Date: 2023-05-07
+SageMath version 10.1.beta1, Release Date: 2023-05-28
diff --git a/bootstrap-conda b/bootstrap-conda
@@ -17,7 +17,7 @@ OPTIONAL_SYSTEM_PACKAGES=
 SAGELIB_SYSTEM_PACKAGES=
 SAGELIB_OPTIONAL_SYSTEM_PACKAGES=
 DEVELOP_SYSTEM_PACKAGES=
-for PKG_BASE in $(sage-package list --has-file distros/conda.txt); do
+for PKG_BASE in $(sage-package list --has-file distros/conda.txt --exclude _sagemath); do
     PKG_SCRIPTS=build/pkgs/$PKG_BASE
     SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/conda.txt
     PKG_TYPE=$(cat $PKG_SCRIPTS/type)

diff --git a/build/pkgs/4ti2/checksums.ini b/build/pkgs/4ti2/checksums.ini
@@ -1,4 +1,5 @@
 tarball=4ti2-VERSION.tar.gz
-sha1=9a9a6913bcd52b667355a7df7fa954ca101054cb
-md5=90def0d6b01a0247e439356777467497
-cksum=439147307
+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
diff --git a/build/pkgs/4ti2/package-version.txt b/build/pkgs/4ti2/package-version.txt
@@ -1 +1 @@
-1.6.7.p0
+1.6.10
diff --git a/build/pkgs/_bootstrap/distros/conda.txt b/build/pkgs/_bootstrap/distros/conda.txt
@@ -1,2 +1,5 @@
 # Packages needed for ./bootstrap
-autoconf automake libtool
+autoconf
+automake
+libtool
+pkg-config
diff --git a/build/pkgs/_bootstrap/distros/slackware.txt b/build/pkgs/_bootstrap/distros/slackware.txt
@@ -2,3 +2,4 @@
 autoconf
 automake
 libtool
+pkg-config
diff --git a/build/pkgs/_bootstrap/distros/void.txt b/build/pkgs/_bootstrap/distros/void.txt
@@ -1,3 +1,4 @@
 # Packages needed for ./bootstrap
 autoconf automake libtool
 xtools mk-configure
+pkg-config
diff --git a/build/pkgs/_prereq/distros/conda.txt b/build/pkgs/_prereq/distros/conda.txt
@@ -5,4 +5,3 @@ perl
 python
 tar
 bc
-pkg-config
diff --git a/build/pkgs/_prereq/distros/slackware.txt b/build/pkgs/_prereq/distros/slackware.txt
@@ -14,6 +14,5 @@ python3          # on slackware-current
 flex
 # for https upstream_url downloads
 ca-certificates
-pkg-config
 libxml2
 cyrus-sasl
diff --git a/build/pkgs/_prereq/distros/void.txt b/build/pkgs/_prereq/distros/void.txt
@@ -5,7 +5,6 @@ libgomp-devel
 m4
 make
 perl
-pkg-config
 python3
 tar
 which
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=d18a37f4dd7bcf8645cb1d34ab5de2b0f74e14c8
-md5=70a288640882b840de76a1b883897094
-cksum=3571416681
+sha1=3420eff6767e23f15913f1293a1686a66d816453
+md5=56ba700a555b960eec313fa20261433e
+cksum=3706935509
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-c1aea0aa2bcd7ab2e2f98f2a27a458809da1ce7e
+21e8f9faf13b5d278c4289a7f818c8aa43d47c19
diff --git a/build/pkgs/ecl/dependencies b/build/pkgs/ecl/dependencies
@@ -1,4 +1,4 @@
-$(MP_LIBRARY) readline gc libffi
+$(MP_LIBRARY) readline gc libffi info
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/ecl/spkg-configure.m4 b/build/pkgs/ecl/spkg-configure.m4
@@ -35,10 +35,7 @@ SAGE_SPKG_CONFIGURE([ecl], [
     AC_SUBST(SAGE_ECL_CONFIG, [$ECL_CONFIG])
   fi
 
-  # Maxima cannot yet be provided by the system, so we always use
+  # Kenzo cannot yet be provided by the system, so we always use
   # the SAGE_LOCAL path for now.
-  AC_SUBST(SAGE_MAXIMA_FAS, ['${prefix}'/lib/ecl/maxima.fas])
-
-  # Likewise for the optional Kenzo SPKG
   AC_SUBST(SAGE_KENZO_FAS, ['${prefix}'/lib/ecl/kenzo.fas])
 ])
diff --git a/build/pkgs/ecl/spkg-install.in b/build/pkgs/ecl/spkg-install.in
@@ -31,18 +31,6 @@ cp "$SAGE_ROOT"/config/config.* src
 
 if [ x"$SAGE_SPKG_INSTALL_DOCS" != xyes ] ; then
     ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
-else
-    # ECL 2020 needs modern makeinfo
-    command -v texi2any >/dev/null 2>&1
-    if [ $? -ne 0 ]; then # texi2any not found -> makeinfo too old, if present
-        ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
-    else
-        if makeinfo -c foo 2>&1 | grep -q invalid; then
-            # makeinfo found but does not support all options that ecl
-            # likes to use
-            ECL_CONFIGURE="$ECL_CONFIGURE --enable-manual=no"
-        fi
-    fi
 fi
 
 sdh_configure $SAGE_CONFIGURE_GMP \

diff --git a/build/pkgs/gcc/spkg-configure.m4 b/build/pkgs/gcc/spkg-configure.m4
@@ -232,7 +232,7 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
     fi
     AC_SUBST(CFLAGS_MARCH)
 
-    # Determine wether compiler supports OpenMP.
+    # Determine whether compiler supports OpenMP.
     AC_LANG_PUSH([C])
     AX_OPENMP([
         AC_SUBST(OPENMP_CFLAGS)

diff --git a/build/pkgs/giac/spkg-configure.m4 b/build/pkgs/giac/spkg-configure.m4
@@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([giac], [
        m4_pushdef([GIAC_MAX_VERSION], [1.9.999])
        AC_CACHE_CHECK([for giac >= ]GIAC_MIN_VERSION[, <= ]GIAC_MAX_VERSION, [ac_cv_path_GIAC], [
          AC_PATH_PROGS_FEATURE_CHECK([GIAC], [giac], [
-            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -1)
+            giac_version=$($ac_path_GIAC --version 2> /dev/null | tail -n 1)
             AS_IF([test -n "$giac_version"], [
                 AX_COMPARE_VERSION([$giac_version], [ge], GIAC_MIN_VERSION, [
                     AX_COMPARE_VERSION([$giac_version], [le], GIAC_MAX_VERSION, [

diff --git a/build/pkgs/info/distros/fedora.txt b/build/pkgs/info/distros/fedora.txt
@@ -1 +1 @@
-texinfo
+texinfo info
diff --git a/build/pkgs/info/spkg-configure.m4 b/build/pkgs/info/spkg-configure.m4
@@ -1,4 +1,14 @@
 SAGE_SPKG_CONFIGURE([info], [
   AC_PATH_PROG(INFO, info)
-  AS_IF([test -z "${INFO}"], [sage_spkg_install_info=yes])
+  AS_IF([test -z "${INFO}"], [sage_spkg_install_info=yes
+    ], [
+     dnl very old makeinfo are not texi2any, newer are symlinks to texi2any
+     AC_PATH_PROG(TEXI2ANY, texi2any)
+     AS_IF([test -z "${TEXI2ANY}"], [sage_spkg_install_info=yes
+       ], [
+        AS_IF([makeinfo -c foo 2>&1 | grep -q invalid], [
+         dnl makeinfo found, but too old, and  does not support all options that ecl likes to use
+         sage_spkg_install_info=yes])
+       ])
+    ])
 ])
diff --git a/build/pkgs/info/spkg-install.in b/build/pkgs/info/spkg-install.in
@@ -1,2 +1,2 @@
-cd src/info
+cd src
 sdh_make_install
diff --git a/build/pkgs/info/type b/build/pkgs/info/type
@@ -1 +1 @@
-optional
+standard
diff --git a/build/pkgs/jupyter_packaging/distros/conda.txt b/build/pkgs/jupyter_packaging/distros/conda.txt
@@ -1 +1 @@
-jupyter-packaging
+# jupyter-packaging  # only a build dependency, not needed at runtime; conda package does not support Python 3.11 as of 2023-05
diff --git a/build/pkgs/libgd/SPKG.rst b/build/pkgs/libgd/SPKG.rst
@@ -23,9 +23,4 @@ Upstream Contact
 
 -  https://libgd.github.io
 -  Pierre Joye (http://blog.thepimp.net)
--  http://libgd.bitbucket.org/
-
-Special Update/Build Instructions
----------------------------------
-
-See spkg-src script.
+-  https://github.com/libgd/libgd
diff --git a/build/pkgs/libgd/checksums.ini b/build/pkgs/libgd/checksums.ini
@@ -1,5 +1,5 @@
 tarball=libgd-VERSION.tar.xz
-sha1=dddf5e9d25cb0b20b8642d5cbcfad67f8903532f
-md5=0ee844caca06bb02bf4b4dabdfab4fb1
-cksum=902217083
+sha1=7ce6ecb5aed26c08246a37b6351c886ab4b51ca2
+md5=7a58b54d375eda236414201252a0ee3c
+cksum=1360697583
 upstream_url=https://github.com/libgd/libgd/releases/download/gd-VERSION/libgd-VERSION.tar.xz
diff --git a/build/pkgs/libgd/dependencies b/build/pkgs/libgd/dependencies
@@ -1,4 +1,4 @@
-libpng freetype xz
+libpng xz
 
 # xz needed to unpack tarball when sage-bootstrap-python is Python < 3.3
 ----------

diff --git a/build/pkgs/libgd/package-version.txt b/build/pkgs/libgd/package-version.txt
@@ -1 +1 @@
-2.3.2
+2.3.3
diff --git a/build/pkgs/libgd/spkg-install.in b/build/pkgs/libgd/spkg-install.in
@@ -2,25 +2,13 @@ cd src
 
 export CFLAGS="-g $CFLAGS"
 
-if [ "$UNAME" = "CYGWIN" ]; then
-    # Compiling with vpx support creates a broken library in some cases
-    # because the vpx package itself is broken on some older Cygwin versions;
-    # we don't need this feature so safer to just disable
-    # https://github.com/sagemath/sage/issues/27970
-    LIBGD_CONFIGURE="--without-vpx $LIBGD_CONFIGURE"
-fi
-if [ -n "$SAGE_FREETYPE_PREFIX" ]; then
-    LIBGD_CONFIGURE="--with-freetype=$SAGE_FREETYPE_PREFIX $LIBGD_CONFIGURE"
-else
-    LIBGD_CONFIGURE="--with-freetype=yes $LIBGD_CONFIGURE"
-fi
-
-# We explicitly disable X and fontconfig support, since (1) X is not a SAGE dependency,
-# and (2) the gd build fails on a lot of OS X PPC machines when X is enabled.
-# Also, libgd will try to link against system libavif/libvmaf and fail
-# on Fedora 34
+# We explicitly disable X, fontconfig, and support of various formats/libraries.
+# We only need png.
+# see https://github.com/libgd/libgd/blob/master/configure.ac
 sdh_configure --without-jpeg --without-xpm --without-x --without-fontconfig \
-              --without-avif \
+              --without-avif --without-freetype --without-raqm --without-liq \
+              --without-tiff --without-webp --without-heif \
+              --disable-gd-formats \
               --with-zlib="$SAGE_LOCAL" $LIBGD_CONFIGURE
 sdh_make
 sdh_make_install
diff --git a/build/pkgs/libgd/spkg-src b/build/pkgs/libgd/spkg-src
diff --git a/build/pkgs/maxima/checksums.ini b/build/pkgs/maxima/checksums.ini
@@ -1,5 +1,5 @@
 tarball=maxima-VERSION.tar.gz
-sha1=ed15d5285794413ba94412079eca3d0fa55a47bf
-md5=9b9ae1dace55b1386739dabaa9122e60
-cksum=1765409766
+sha1=1010594e6d6082bbd8efaac1b7756ec1721a4ed5
+md5=3c01f1daa6936e11d8713fef7751d3fe
+cksum=2420393096
 upstream_url=https://sourceforge.net/projects/maxima/files/Maxima-source/VERSION-source/maxima-VERSION.tar.gz/download
diff --git a/build/pkgs/maxima/dependencies b/build/pkgs/maxima/dependencies
@@ -1,4 +1,4 @@
-ecl
+ecl info
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/maxima/distros/arch.txt b/build/pkgs/maxima/distros/arch.txt
@@ -1 +1 @@
-maxima-ecl
+maxima-fas
diff --git a/build/pkgs/maxima/distros/cygwin.txt b/build/pkgs/maxima/distros/cygwin.txt
@@ -0,0 +1 @@
+maxima
diff --git a/build/pkgs/maxima/distros/freebsd.txt b/build/pkgs/maxima/distros/freebsd.txt
@@ -0,0 +1 @@
+math/maxima
diff --git a/build/pkgs/maxima/distros/gentoo.txt b/build/pkgs/maxima/distros/gentoo.txt
@@ -0,0 +1,2 @@
+sci-mathematics/maxima[ecls]
+
diff --git a/build/pkgs/maxima/package-version.txt b/build/pkgs/maxima/package-version.txt
@@ -1 +1 @@
-5.45.0.p0
+5.46.0