Merge branch 'develop' into sage_symbolic_modularization_fixes

sagemath · Jun 11, 2023 · 9aadb6f · 9aadb6f
2 parents dcaba14 + 443b754
commit 9aadb6f
Show file tree

Hide file tree

Showing 301 changed files with 4,006 additions and 2,742 deletions.
diff --git a/.github/workflows/doc-publish.yml b/.github/workflows/doc-publish.yml
@@ -75,7 +75,7 @@ jobs:
             [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/set-commit-status-action@1.1.6
+        uses: myrotvorets/set-commit-status-action@v1.1.7
         if: ${{ always() }}
         env:
           DEPLOY_SUCCESS: Successfully deployed preview.

diff --git a/.zenodo.json.in b/.zenodo.json.in
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: 9.5
+version: 10.1.beta3
 doi: 10.5281/zenodo.593563
-date-released: 2022-01-18
+date-released: 2023-06-11
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"
diff --git a/CITATION.cff.in b/CITATION.cff.in
@@ -0,0 +1,11 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+title: SageMath
+abstract: SageMath is a free open-source mathematics software system.
+authors:
+- name: "The SageMath Developers"
+version: ${SAGE_VERSION}
+doi: 10.5281/zenodo.593563
+date-released: ${SAGE_RELEASE_DATE}
+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.1.beta2, Release Date: 2023-06-03
+SageMath version 10.1.beta3, Release Date: 2023-06-11
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=05ff783186ba44f6afec3fad5fecea42acb32db6
-md5=ecd17bd2d001b1c17586fa7877550bf9
-cksum=1852648534
+sha1=c7c1743bdc3941301764422bef5694849cd1e265
+md5=610ce114c46a794ffd70346581012808
+cksum=2506747194
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-17aa7f7ea5b8522f028ef5a87613f1979978a748
+464d3d20aaa0a04237ebc98378cf1eec48505e17
diff --git a/build/pkgs/igraph/checksums.ini b/build/pkgs/igraph/checksums.ini
@@ -1,5 +1,5 @@
 tarball=igraph-VERSION.tar.gz
-sha1=20587332f0f36d6d7eb3cca248e2dab76e1e58ad
-md5=af41eb9c614946c4a92a51834e9cab4a
-cksum=4011381306
+sha1=fc3c6627f889b13581b2b468e1b16aceff453cfc
+md5=10a3f325425970c75a7ba8359376e208
+cksum=3103730646
 upstream_url=https://github.com/igraph/igraph/releases/download/VERSION/igraph-VERSION.tar.gz
diff --git a/build/pkgs/igraph/package-version.txt b/build/pkgs/igraph/package-version.txt
@@ -1 +1 @@
-0.10.2
+0.10.4
diff --git a/build/pkgs/info/spkg-configure.m4 b/build/pkgs/info/spkg-configure.m4
@@ -9,6 +9,7 @@ SAGE_SPKG_CONFIGURE([info], [
         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])
+        rm -f stdin.info
        ])
     ])
 ])
diff --git a/build/pkgs/maxima/spkg-install.in b/build/pkgs/maxima/spkg-install.in
@@ -20,6 +20,10 @@ cd src/
 # Use newer version of config.guess and config.sub (see Trac #19734)
 cp "$SAGE_ROOT"/config/config.* .
 
+# Patch out bad 'multiple targets' rule
+# https://github.com/sagemath/sage/pull/35619#issuecomment-1567351409
+sed -i.bak 's/^maxima_singlepage.html //' doc/info/Makefile.in
+
 # Note that maxima configure checks for git and, if it finds it, uses
 # versions information from the repo. See #15529. We disable this with
 # git_found=false

diff --git a/build/pkgs/networkx/checksums.ini b/build/pkgs/networkx/checksums.ini
@@ -1,5 +1,5 @@
 tarball=networkx-VERSION.tar.gz
-sha1=40e981041664856ba473c9079006367ed0d0e71b
-md5=22139ab5a47818fa00cbaa91eb126381
-cksum=4201985987
+sha1=d4b1d6117b7c54db61f6cbec8f0ccfb0f7d47293
+md5=1a9baa93b7fd4470c80e29a7a6d93ccf
+cksum=1675580484
 upstream_url=https://pypi.io/packages/source/n/networkx/networkx-VERSION.tar.gz
diff --git a/build/pkgs/networkx/install-requires.txt b/build/pkgs/networkx/install-requires.txt
@@ -1,2 +1 @@
-# features removed in 3.0 listed in https://networkx.org/documentation/stable/developer/deprecations.html#version-3-0
-networkx >=2.4, <3.0
+networkx >=2.4, <3.2
diff --git a/build/pkgs/networkx/package-version.txt b/build/pkgs/networkx/package-version.txt
@@ -1 +1 @@
-2.8.8
+3.1
diff --git a/build/pkgs/pyflakes/SPKG.rst b/build/pkgs/pyflakes/SPKG.rst
diff --git a/build/pkgs/pyflakes/distros/conda.txt b/build/pkgs/pyflakes/distros/conda.txt
diff --git a/build/pkgs/pyflakes/distros/macports.txt b/build/pkgs/pyflakes/distros/macports.txt
diff --git a/build/pkgs/pyflakes/distros/opensuse.txt b/build/pkgs/pyflakes/distros/opensuse.txt
diff --git a/build/pkgs/pyflakes/distros/repology.txt b/build/pkgs/pyflakes/distros/repology.txt
diff --git a/build/pkgs/pyflakes/distros/void.txt b/build/pkgs/pyflakes/distros/void.txt
diff --git a/build/pkgs/pyflakes/requirements.txt b/build/pkgs/pyflakes/requirements.txt
diff --git a/build/pkgs/pyflakes/type b/build/pkgs/pyflakes/type
diff --git a/build/pkgs/python_igraph/checksums.ini b/build/pkgs/python_igraph/checksums.ini
@@ -1,5 +1,5 @@
 tarball=python-igraph-VERSION.tar.gz
-sha1=6a6bca77737ff501e97f808aa18a9045e86b3e3e
-md5=6951cc2e803118b74209ae21d54de38a
-cksum=650236223
+sha1=807a95ad4080d8eb500e7797325d6f11a5c46892
+md5=2ac3561dda7e7321789041261a29aba4
+cksum=754615899
 upstream_url=https://pypi.io/packages/source/i/igraph/igraph-VERSION.tar.gz
diff --git a/build/pkgs/python_igraph/package-version.txt b/build/pkgs/python_igraph/package-version.txt
@@ -1 +1 @@
-0.10.2
+0.10.4
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.1b2
+sage-conf ~= 10.1b3
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.1b2
+sage-docbuild ~= 10.1b3
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.1b2
+sage-setup ~= 10.1b3
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.1b2
+sage-sws2rst ~= 10.1b3
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
-sagelib ~= 10.1b2
+sagelib ~= 10.1b3
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.1b2
+sagemath-categories ~= 10.1b3
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.1b2
+sagemath-environment ~= 10.1b3
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.1b2
+sagemath-objects ~= 10.1b3
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.1b2
+sagemath-repl ~= 10.1b3
diff --git a/build/pkgs/symengine/checksums.ini b/build/pkgs/symengine/checksums.ini
@@ -1,5 +1,5 @@
 tarball=symengine-VERSION.tar.gz
-sha1=87a0104d8682cb2f192d8b4bf3435a514bdb6f4c
-md5=967b913b365eda9fb30ecb3f1ded46f2
-cksum=2359123828
+sha1=11885879ddcd0a9ab69e36a79b93aef836d6c95d
+md5=4673c85b423241ce85a9df35a7ed61bb
+cksum=1344562381
 upstream_url=https://github.com/symengine/symengine/releases/download/vVERSION/symengine-VERSION.tar.gz
diff --git a/build/pkgs/symengine/package-version.txt b/build/pkgs/symengine/package-version.txt
@@ -1 +1 @@
-0.8.1
+0.10.1
diff --git a/build/pkgs/symengine_py/checksums.ini b/build/pkgs/symengine_py/checksums.ini
@@ -1,5 +1,5 @@
 tarball=symengine.py-VERSION.tar.gz
-sha1=16da67020baf6ab95cd517f58618fa7af1c8fc5e
-md5=1c365dd039f8568b732c39fa4c9a7cf4
-cksum=3244910588
+sha1=fbbf052e66077ec51df319444b71f94114f33d9e
+md5=fc5d2d7f571a880aa2e040214aed2ff0
+cksum=2535731241
 upstream_url=https://github.com/symengine/symengine.py/archive/vVERSION.tar.gz
diff --git a/build/pkgs/symengine_py/package-version.txt b/build/pkgs/symengine_py/package-version.txt
@@ -1 +1 @@
-0.8.1.p0
+0.10.0
diff --git a/build/pkgs/symengine_py/patches/0001-Fix-getting-string-representation-of-sage-objects.patch b/build/pkgs/symengine_py/patches/0001-Fix-getting-string-representation-of-sage-objects.patch
diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/src/VERSION.txt b/src/VERSION.txt
@@ -1 +1 @@
-10.1.beta2
+10.1.beta3
diff --git a/src/bin/sage-update-version b/src/bin/sage-update-version
@@ -86,17 +86,17 @@ echo "$SAGE_VERSION_BANNER" > "$SAGE_ROOT/VERSION.txt"
 # Regenerate auto-generated files tarball
 "$SAGE_ROOT/bootstrap" -s
 
-# Create json file for Zenodo
+# Create CITATION file for Zenodo-GitHub integration
 export SAGE_VERSION
 export SAGE_RELEASE_DATE
-envsubst <"$SAGE_ROOT/.zenodo.json.in" >"$SAGE_ROOT/.zenodo.json"
+envsubst <"$SAGE_ROOT/CITATION.cff.in" >"$SAGE_ROOT/CITATION.cff"
 
 # Commit auto-generated changes
 git commit -m "Updated SageMath version to $SAGE_VERSION" -- \
     "$SAGE_ROOT/VERSION.txt" \
-    "$SAGE_ROOT/.zenodo.json" \
     "$SAGE_SRC/sage/version.py" \
     "$SAGE_SRC/VERSION.txt" \
+    "$SAGE_ROOT/CITATION.cff" \
     "$SAGE_SRC/bin/sage-version.sh" \
     "$SAGE_ROOT/build/pkgs/configure/checksums.ini" \
     "$SAGE_ROOT/build/pkgs/configure/package-version.txt" \