Merge tag '10.1.beta7' into sage_symbolic_modularization_fixes

SageMath version 10.1.beta7, Release Date: 2023-07-20

.github/workflows/ci-conda.yml

@@ -34,7 +34,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         python: ['3.9', '3.10', '3.11']
-        conda-env: [environment, environment-optional]
+        # Optional environment is disabled for now as its not yet working
+        # environment: [environment, environment-optional]
+        conda-env: [environment]
 
     steps:
       - uses: actions/checkout@v3
@@ -100,19 +102,20 @@ jobs:
           SAGE_NUM_THREADS: 2
 
       - name: Verify dependencies
-        if: always()
+        if: success() || failure()
         shell: bash -l {0}
         run: pip check
 
       - name: Test
+        if: success() || failure()
         shell: bash -l {0}
         run: ./sage -t --all -p0
 
       - name: Print logs
+        if: always()
         run: |
           for file in $(find . -type f -name "*.log"); do
               echo "::group::$file"
               cat "$file"
               echo "::endgroup::"
           done
-        if: always()

.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,E21,E222,E227,E251,E271,E303,E306,E401,E502,E701,E702,E703,E71,E72,W291,W293,W391,W605"],
+    "python.linting.pycodestyleArgs": ["--select= E111,E21,E222,E227,E25,E271,E303,E306,E401,E502,E701,E702,E703,E71,E72,W291,W293,W391,W605"],
     "cSpell.words": [
         "furo",
         "Conda",

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.1.beta6
+version: 10.1.beta7
 doi: 10.5281/zenodo.593563
-date-released: 2023-07-09
+date-released: 2023-07-20
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.1.beta6, Release Date: 2023-07-09
+SageMath version 10.1.beta7, Release Date: 2023-07-20

bootstrap

@@ -110,10 +110,14 @@ SAGE_SPKG_FINALIZE([$pkgname], [$pkgtype], [$SPKG_SOURCE], [$SPKG_TREE_VAR])"
         echo 'changequote(>>>`<<<, >>>'"'"'<<<)dnl' >> $a
     done
 
-    for pkgname in $(sage-package list --has-file bootstrap); do
-        (cd build/pkgs/$pkgname && ./bootstrap) || exit 1
+    for pkgname in $(sage-package list --has-file bootstrap "$@"); do
+        (cd build/pkgs/$pkgname && if [ -x bootstrap ]; then ./bootstrap; else echo >&2 "bootstrap:$LINENO: Nothing to do for $pkgname"; fi) || exit 1
     done
 
+    if [ $# != 0 ]; then
+        return
+    fi
+
     # Default to no filter if "-q" was not passed.
     QUIET_SED_FILTER=""
     if [ "${BOOTSTRAP_QUIET}" = "yes" ]; then
@@ -126,7 +130,6 @@ SAGE_SPKG_FINALIZE([$pkgname], [$pkgtype], [$SPKG_SOURCE], [$SPKG_TREE_VAR])"
     # stdout alone. Basically we swap the two descriptors using a
     # third, filter, and then swap them back.
     ./bootstrap-conda && \
-    src/doc/bootstrap && \
     aclocal -I m4 && \
     automake --add-missing --copy build/make/Makefile-auto 3>&1 1>&2 2>&3 \
         | sed "${QUIET_SED_FILTER}" 3>&1 1>&2 2>&3 && \
@@ -236,7 +239,7 @@ save () {
 
 
 usage () {
-    echo >&2 "Usage: $0 [-d|-D|-s] [-u <URL>] [-h] [-q]"
+    echo >&2 "Usage: $0 [-d|-D|-s] [-u <URL>] [-h] [-q] [SPKG...]"
     echo >&2 ""
     echo >&2 "Options:"
     echo >&2 "  -d         fall back to downloading (released versions only)"
@@ -269,6 +272,7 @@ do
          ?) usage; exit 2;;
      esac
 done
+shift $(($OPTIND - 1))
 export BOOTSTRAP_QUIET
 CONFBALL="upstream/configure-$CONFVERSION.tar.gz"
 
@@ -278,14 +282,22 @@ if [ $DOWNLOAD$SAVE = yesyes ]; then
     exit 2
 fi
 
-# Start cleanly (it's not a problem if this fails)
+if [ $# != 0 -a $DOWNLOAD$ALWAYSDOWNLOAD$SAVE != nonono ]; then
+    echo >&2 "$0: Cannot combine -d, -D, -s, -u with SPKG arguments"
+    usage
+    exit 2
+fi
+
+# Start cleanly when a full bootstrap is happening (it's not a problem if this fails)
 # POSIX supports two separate incompatible formats for the MAKEFLAGS
 # variable, so instead of guessing, we simply define our own variable
 # to optionally pass an "-s" (silent) flag to Make.
-MAKE_SILENT=""
-[ "${BOOTSTRAP_QUIET}" = "yes" ] && MAKE_SILENT="-s"
-$MAKE ${MAKE_SILENT} bootstrap-clean 2>/dev/null
-mkdir config 2>/dev/null
+if [ $# = 0 ]; then
+    MAKE_SILENT=""
+    [ "${BOOTSTRAP_QUIET}" = "yes" ] && MAKE_SILENT="-s"
+    $MAKE ${MAKE_SILENT} bootstrap-clean 2>/dev/null
+fi
+mkdir -p config 2>/dev/null
 
 if [ $ALWAYSDOWNLOAD = yes ]; then
     if [ -n "$CONFTARBALL_URL" ]; then
@@ -302,7 +314,7 @@ if [ $ALWAYSDOWNLOAD = yes ]; then
         bootstrap_download || exit $?
     fi
 else
-    bootstrap
+    bootstrap "$@"
 fi
 
 if [ $SAVE = yes ]; then

build/pkgs/barvinok/SPKG.rst

@@ -17,4 +17,5 @@ GPL v2
 Upstream Contact
 ----------------
 
--  http://groups.google.com/group/isl-development
+-  https://sourceforge.net/projects/barvinok/
+-  https://groups.google.com/group/isl-development

build/pkgs/barvinok/checksums.ini

@@ -1,4 +1,5 @@
-tarball=barvinok-VERSION.tar.bz2
-sha1=31c50d4b2a4cebe049072fd54c6e41ccece5ec1d
-md5=60082222a73b2d4fd430da7b770a4072
-cksum=355377045
+tarball=barvinok-VERSION.tar.xz
+sha1=1e17e72732f7e96017d9ae0c3394c3c77c185f2e
+md5=57066c5aa5628b89345c16ed95f93d7e
+cksum=2863920036
+upstream_url=https://sourceforge.net/projects/barvinok/files/barvinok-VERSION.tar.xz

build/pkgs/barvinok/distros/freebsd.txt

@@ -0,0 +1 @@
+math/barvinok

build/pkgs/barvinok/package-version.txt

@@ -1 +1 @@
-0.41.1
+0.41.7

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=354d134d4bcdedba55ed2bcb1eac6ea33146ca15
-md5=2143a40fdce9ed5cb8b29a6232be4789
-cksum=304076036
+sha1=017780512407f8da87a091c485cf8c7162b5adaf
+md5=4e3e25464ee850c2593f16364bd6b206
+cksum=531215747

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-37fa2da8e75716793e91c384237a5e9f67ed83e8
+98520945e069c603400cf2ae902a843f7a1bda13

build/pkgs/mpmath/SPKG.rst

@@ -20,6 +20,6 @@ Upstream Contact
 
 -  Author: Fredrik Johansson
 -  Email: [email protected]
--  http://mpmath.org
--  Website: https://github.com/fredrik-johansson/mpmath/
+-  https://mpmath.org
+-  Website: https://github.com/mpmath/mpmath
 

build/pkgs/mpmath/checksums.ini

@@ -1,5 +1,5 @@
 tarball=mpmath-VERSION.tar.gz
-sha1=ce8bd24606eeb02218b26304e6d99228919021f8
-md5=ef8a6449851755319673b06f71731d52
-cksum=3549837503
+sha1=b7c00f35eb35978197c8f5afc11a8b4b994dd382
+md5=d5d17bbefea73eeb959967351d905306
+cksum=1852385672
 upstream_url=https://files.pythonhosted.org/packages/source/m/mpmath/mpmath-VERSION.tar.gz

build/pkgs/mpmath/package-version.txt

@@ -1 +1 @@
-1.2.1
+1.3.0

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.1b6
+sage-conf ~= 10.1b7

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.1b6
+sage-docbuild ~= 10.1b7

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.1b6
+sage-setup ~= 10.1b7

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.1b6
+sage-sws2rst ~= 10.1b7

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.1b6
+sagelib ~= 10.1b7

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.1b6
+sagemath-categories ~= 10.1b7

build/pkgs/sagemath_doc_html/bootstrap

@@ -0,0 +1 @@
+src/bootstrap

build/pkgs/sagemath_doc_html/src

@@ -0,0 +1 @@
+../../../src/doc

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.1b6
+sagemath-environment ~= 10.1b7

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.1b6
+sagemath-objects ~= 10.1b7

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.1b6
+sagemath-repl ~= 10.1b7

build/pkgs/sphinx/distros/conda.txt

@@ -1 +1 @@
-sphinx<6,>=5.2
+sphinx<8,>=5.2

build/pkgs/sphinx/install-requires.txt

@@ -1 +1 @@
-sphinx >=5.2, <6
+sphinx >=5.2, <8

pkgs/sage-conf/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

pkgs/sage-conf_pypi/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

pkgs/sage-docbuild/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

pkgs/sage-setup/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

pkgs/sage-sws2rst/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

pkgs/sagemath-categories/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

pkgs/sagemath-environment/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

pkgs/sagemath-objects/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

pkgs/sagemath-repl/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

src/VERSION.txt

@@ -1 +1 @@
-10.1.beta6
+10.1.beta7

src/bin/sage-version.sh

@@ -4,6 +4,6 @@
 # which stops "setup.py develop" from rewriting it as a Python file.
 :
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='10.1.beta6'
-SAGE_RELEASE_DATE='2023-07-09'
-SAGE_VERSION_BANNER='SageMath version 10.1.beta6, Release Date: 2023-07-09'
+SAGE_VERSION='10.1.beta7'
+SAGE_RELEASE_DATE='2023-07-20'
+SAGE_VERSION_BANNER='SageMath version 10.1.beta7, Release Date: 2023-07-20'

src/doc/de/tutorial/interactive_shell.rst

@@ -373,7 +373,7 @@ Fehlerbehandlung
 Wenn irgendetwas schief geht, werden Sie normalerweise eine
 Python-Fehlermeldung sehen. Python macht sogar einen Vorschlag, was den
 Fehler ausgelöst hat. Oft sehen Sie den Namen der Fehlermeldung,
-z.B. ``NameError`` oder ``ValueError`` (vgl. Python Library Reference
+z.B. :class:`NameError` oder :class:`ValueError` (vgl. Python Library Reference
 [PyLR]_ für eine komplette Liste der Fehlermeldungen). Zum Beispiel:
 
 .. skip

src/doc/en/faq/faq-usage.rst

@@ -115,7 +115,7 @@ issue these commands:
     import _tkinter
     import Tkinter
 
-If they do not raise an ``ImportError`` then it worked.
+If they do not raise an :class:`ImportError` then it worked.
 
 
 How do I import Sage into a Python script?
@@ -663,7 +663,7 @@ With objects a and b and a function f, I accidentally typed f(a) = b instead of
 It is because of how functions are defined in Sage with the
 ``f(x) = expr`` notation using the preparser. Also notice that if you
 make this mistake inside of an ``if`` statement, you will get a
-``SyntaxError`` before anything else goes wrong. So in this case,
+:class:`SyntaxError` before anything else goes wrong. So in this case,
 there is no problem.
 
 

src/doc/en/installation/source.rst

@@ -546,7 +546,7 @@ If
    sage: import _tkinter
    sage: import Tkinter
 
-does not raise an ``ImportError``, then it worked.
+does not raise an :class:`ImportError`, then it worked.
 
 .. _build-from-source-step-by-step:
 

src/doc/en/reference/coercion/index.rst

@@ -345,7 +345,7 @@ Methods to implement
     this case ``r * s`` gets handled as ``r._act_on_(s, True)`` or
     ``s._acted_upon_(r, False)`` and ``s * r`` as ``r._act_on_(s, False)`` or
     ``s._acted_upon_(r, True)``. There is no constraint on the type or parents
-    of objects passed to these methods; raise a ``TypeError`` or ``ValueError``
+    of objects passed to these methods; raise a :class:`TypeError` or :class:`ValueError`
     if the wrong kind of object is passed in to indicate the action is not
     appropriate here.
 

src/doc/en/thematic_tutorials/tutorial-programming-python.rst

@@ -176,9 +176,9 @@ indentation. Most of the time a new block is introduced by
 
   .. CODE-BLOCK:: python
 
-     raise <ErrorType> [, error message]
+     raise <ErrorType>[("error message")]
 
-  Usual errors include ``ValueError`` and ``TypeError``.
+  Usual errors include :class:`ValueError` and :class:`TypeError`.
 
 Functions
 =========

src/doc/en/tutorial/interactive_shell.rst

@@ -426,7 +426,7 @@ Errors and Exceptions
 When something goes wrong, you will usually see a Python
 "exception". Python even tries to suggest what raised the
 exception. Often you see the name of the exception, e.g.,
-``NameError`` or ``ValueError`` (see the Python Library Reference [PyLR]_
+:class:`NameError` or :class:`ValueError` (see the Python Library Reference [PyLR]_
 for a complete list of exceptions). For example,
 
 .. skip

src/doc/en/tutorial/tour_algebra.rst

@@ -16,7 +16,7 @@ functions are defined to be ``var(...)``. As an example:
     sage: diff(sin(u), u)
     cos(u)
 
-If you get a ``NameError``, check to see if you misspelled something,
+If you get a :class:`NameError`, check to see if you misspelled something,
 or forgot to define a variable with ``var(...)``.
 
 

src/doc/en/tutorial/tour_functions.rst

@@ -24,7 +24,7 @@ These functions can be plotted, but not differentiated or integrated.
        Graphics object consisting of 1 graphics primitive
 
 In the last line, note the syntax. Using ``plot(f(z), 0, 2)`` instead
-will give a ``NameError``, because ``z`` is a dummy variable in the
+will give a :class:`NameError`, because ``z`` is a dummy variable in the
 definition of ``f`` and is not defined outside of that definition.
 In order to be able to use ``f(z)`` in the plot command, ``z``
 (or whatever is desired) needs to be defined as a variable.  We

src/doc/fr/tutorial/interactive_shell.rst

@@ -432,8 +432,9 @@ Erreurs et exceptions
 Quand quelque chose ne marche pas, cela se manifeste habituellement par
 une « exception » Python. Python essaie de plus de donner une idée de ce
 qui a pu déclencher l'exception. Bien souvent, il affiche le nom de
-l'exception (par exemple ``NameError`` ou ``ValueError``, voir le manuel
-de référence de la bibliothèque de Python [PyLR]_ pour une liste complète). Par exemple :
+l'exception (par exemple :class:`NameError` ou :class:`ValueError`, voir
+le manuel de référence de la bibliothèque de Python [PyLR]_ pour une liste
+complète). Par exemple :
 
 .. skip
 

src/doc/it/faq/faq-usage.rst

@@ -98,7 +98,7 @@ lancia i seguenti comandi dall'interfaccia a riga di comando di Sage::
     import _tkinter
     import Tkinter
 
-Se non ti viene segnalato alcun errore di ``ImportError``
+Se non ti viene segnalato alcun errore di :class:`ImportError`
 allora il problema è risolto.
 
 
@@ -662,7 +662,7 @@ Con degli oggetti "a" e "b" ed una funzione "f" ho digitato accidentalmente "f(a
 
 Questo è dovuto a come sono definite le funzioni in Sage con la
 notazione ``f(x)=expr`` usando il preparser. Nota anche che se fai
-quest'errore in un costrutto ``if``, avrai un errore ``SyntaxError``
+quest'errore in un costrutto ``if``, avrai un errore :class:`SyntaxError`
 prima di qualunque altro comportamento errato, quindi, in questo caso,
 non hai il problema.