Merge branch 'develop' into doc-inline-tab-preparse

Author: Matthias Köppe

.github/workflows/ci-linux-incremental.yml

@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get all packages that have changed
         id: changed-packages
-        uses: tj-actions/changed-files@v38
+        uses: tj-actions/changed-files@v41
         with:
           files_yaml: |
             configures:

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.beta5
+version: 10.3.beta6
 doi: 10.5281/zenodo.593563
-date-released: 2024-01-14
+date-released: 2024-01-21
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.3.beta5, Release Date: 2024-01-14
+SageMath version 10.3.beta6, Release Date: 2024-01-21

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=1041fee1d3ed5dc9c6c428668a895fb7109a48e5
-md5=e254e55345074cd0959cb21c8e4716ca
-cksum=1271538328
+sha1=c72fc2006b1702e74f38c480b0376e3e6c8a5758
+md5=a650e8682fe75708f679eabe918d2aa7
+cksum=785462498

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-c6bf497a0fd0f29c721481b52afaf49969c0cef8
+919b021b0c103e4fb798cc784218015e0a515510

build/pkgs/ecl/checksums.ini

@@ -1,5 +1,5 @@
 tarball=ecl-VERSION.tgz
-sha1=c41838960964c6e0b9b83a08bca1f717ccc6951e
-md5=0c9e0437dbf3a7f1b00da32b7794a3b0
-cksum=1854014871
+sha1=612f61f87eedb271025095306eca78d19f3991db
+md5=16bcfd2ce9730691f88e74edaab790af
+cksum=1542706373
 upstream_url=https://common-lisp.net/project/ecl/static/files/release/ecl-VERSION.tgz

build/pkgs/ecl/package-version.txt

@@ -1 +1 @@
-21.2.1
+23.9.9

build/pkgs/ecl/spkg-install.in

@@ -38,19 +38,3 @@ exec </dev/null
 
 sdh_make
 sdh_make_install
-
-# Create symbolic link to lib/ecl-version directory.
-# Also create a symbolic link lib/ecl/ecl -> include/ecl.
-# This is important when the Sage install is moved, see Trac #14662.
-cd "$SAGE_DESTDIR$SAGE_LOCAL/lib/" && rm -f ecl && ln -s ecl-* ecl
-if [ $? -ne 0 ]; then
-    echo >&2 "Error - Failed to create symbolic link to ECL library"
-    echo >&2 "directory ... exiting"
-    exit 1
-fi
-cd "$SAGE_DESTDIR$SAGE_LOCAL/lib/ecl" && rm -f ecl && ln -s ../../include/ecl ecl
-if [ $? -ne 0 ]; then
-    echo >&2 "Error - Failed to create symbolic link to ECL include"
-    echo >&2 "directory ... exiting"
-    exit 1
-fi

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.3b5
+sage-conf ~= 10.3b6

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.3b5
+sage-docbuild ~= 10.3b6

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.3b5
+sage-setup ~= 10.3b6

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.3b5
+sage-sws2rst ~= 10.3b6

build/pkgs/sagelib/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-standard ~= 10.3b5
+sagemath-standard ~= 10.3b6

build/pkgs/sagemath_bliss/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-bliss ~= 10.3b5
+sagemath-bliss ~= 10.3b6

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.3b5
+sagemath-categories ~= 10.3b6

build/pkgs/sagemath_coxeter3/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-coxeter3 ~= 10.3b5
+sagemath-coxeter3 ~= 10.3b6

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.3b5
+sagemath-environment ~= 10.3b6

build/pkgs/sagemath_mcqd/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-mcqd ~= 10.3b5
+sagemath-mcqd ~= 10.3b6

build/pkgs/sagemath_meataxe/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-meataxe ~= 10.3b5
+sagemath-meataxe ~= 10.3b6

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.3b5
+sagemath-objects ~= 10.3b6

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.3b5
+sagemath-repl ~= 10.3b6

build/pkgs/sagemath_sirocco/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-sirocco ~= 10.3b5
+sagemath-sirocco ~= 10.3b6

build/pkgs/sagemath_tdlib/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-tdlib ~= 10.3b5
+sagemath-tdlib ~= 10.3b6

build/sage_bootstrap/app.py

@@ -77,6 +77,37 @@ def list_cls(self, *package_classes, **filters):
         for pkg_name in pc.names:
             print(pkg_name)
 
+    def properties(self, *package_classes, **kwds):
+        """
+        Show the properties of given packages
+
+        $ sage --package properties --format shell maxima
+        path_maxima='........./build/pkgs/maxima'
+        version_with_patchlevel_maxima='5.46.0'
+        type_maxima='standard'
+        source_maxima='normal'
+        trees_maxima='SAGE_LOCAL'
+        """
+        props = kwds.pop('props', ['path', 'version_with_patchlevel', 'type', 'source', 'trees'])
+        format = kwds.pop('format', 'plain')
+        log.debug('Looking up properties')
+        pc = PackageClass(*package_classes)
+        for package_name in pc.names:
+            package = Package(package_name)
+            if format == 'plain':
+                print("{0}:".format(package_name))
+            for p in props:
+                value = getattr(package, p)
+                if value is None:
+                    if p.startswith('version'):
+                        value = 'none'
+                    else:
+                        value = ''
+                if format == 'plain':
+                    print("        {0:28} {1}".format(p + ":", value))
+                else:
+                    print("{0}_{1}='{2}'".format(p, package_name, value))
+
     def name(self, tarball_filename):
         """
         Find the package name given a tarball filename

build/sage_bootstrap/cmdline.py

@@ -83,6 +83,22 @@
 """
 
 
+epilog_properties = \
+"""
+Print properties of given package.
+
+EXAMPLE:
+
+    $ sage --package properties maxima
+    maxima:
+            path:                        /.../build/pkgs/maxima
+            version_with_patchlevel:     5.46.0
+            type:                        standard
+            source:                      normal
+            trees:                       SAGE_LOCAL
+"""
+
+
 epilog_name = \
 """
 Find the package name given a tarball filename
@@ -257,6 +273,19 @@ def make_parser():
         '--exclude-dependencies', action='store_true',
         help='exclude (ordinary) dependencies of the packages recursively')
 
+    parser_properties = subparsers.add_parser(
+        'properties', epilog=epilog_properties,
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        help='Print properties of given packages')
+    parser_properties.add_argument(
+        'package_class', metavar='[package_name|:package_type:]',
+        type=str, nargs='+',
+        help=('package name or designator for all packages of a given type '
+              '(one of :all:, :standard:, :optional:, and :experimental:)'))
+    parser_properties.add_argument(
+        '--format', type=str, default='plain',
+        help='output format (one of plain and shell; default: plain)')
+
     parser_name = subparsers.add_parser(
         'name', epilog=epilog_name,
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -404,6 +433,8 @@ def run():
                      exclude=args.exclude,
                      include_dependencies=args.include_dependencies,
                      exclude_dependencies=args.exclude_dependencies)
+    elif args.subcommand == 'properties':
+        app.properties(*args.package_class, format=args.format)
     elif args.subcommand == 'name':
         app.name(args.tarball_filename)
     elif args.subcommand == 'tarball':

build/sage_bootstrap/package.py

@@ -48,6 +48,7 @@ def __init__(self, package_name):
         self._init_type()
         self._init_install_requires()
         self._init_dependencies()
+        self._init_trees()
 
     def __repr__(self):
         return 'Package {0}'.format(self.name)
@@ -293,13 +294,62 @@ def patchlevel(self):
         """
         return self.__patchlevel
 
+    @property
+    def version_with_patchlevel(self):
+        """
+        Return the version, including the Sage-specific patchlevel
+
+        OUTPUT:
+
+        String.
+        """
+        v = self.version
+        if v is None:
+            return v
+        p = self.patchlevel
+        if p < 0:
+            return v
+        return "{0}.p{1}".format(v, p)
+
     @property
     def type(self):
         """
         Return the package type
         """
         return self.__type
 
+    @property
+    def source(self):
+        """
+        Return the package source type
+        """
+        if self.has_file('requirements.txt'):
+            return 'pip'
+        if self.tarball_filename:
+            if self.tarball_filename.endswith('.whl'):
+                return 'wheel'
+            return 'normal'
+        if self.has_file('spkg-install') or self.has_file('spkg-install.in'):
+            return 'script'
+        return 'none'
+
+    @property
+    def trees(self):
+        """
+        Return the installation trees for the package
+
+        OUTPUT:
+
+        A white-space-separated string of environment variable names
+        """
+        if self.__trees is not None:
+            return self.__trees
+        if self.__install_requires is not None:
+            return 'SAGE_VENV'
+        if self.has_file('requirements.txt'):
+            return 'SAGE_VENV'
+        return 'SAGE_LOCAL'
+
     @property
     def distribution_name(self):
         """
@@ -466,3 +516,10 @@ def _init_dependencies(self):
                 self.__dependencies_order_only = f.readline()
         except IOError:
             self.__dependencies_order_only = ''
+
+    def _init_trees(self):
+        try:
+            with open(os.path.join(self.path, 'trees.txt')) as f:
+                self.__trees = f.readline().partition('#')[0].strip()
+        except IOError:
+            self.__trees = None

m4/sage_spkg_collect.m4

@@ -401,10 +401,12 @@ AC_DEFUN([SAGE_SYSTEM_PACKAGE_NOTICE], [
         SYSTEM=$(build/bin/sage-guess-package-system 2>& AS_MESSAGE_FD)
         AC_MSG_RESULT([$SYSTEM])
         AS_IF([test $SYSTEM != unknown], [
+            print_sys () {
+                build/bin/sage-print-system-package-command $SYSTEM --verbose="    " --prompt="      $ " --sudo "$[@]"
+            }
             SYSTEM_PACKAGES=$(build/bin/sage-get-system-packages $SYSTEM $SAGE_NEED_SYSTEM_PACKAGES)
             AS_IF([test -n "$SYSTEM_PACKAGES"], [
-                PRINT_SYS="build/bin/sage-print-system-package-command $SYSTEM --verbose=\"    \" --prompt=\"      \$ \" --sudo"
-                COMMAND=$(eval "$PRINT_SYS" update && eval "$PRINT_SYS" install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" eval "$PRINT_SYS" setup-build-env )
+                COMMAND=$(print_sys update && print_sys install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" print_sys setup-build-env)
                 AC_MSG_NOTICE([
 
     hint: installing the following system packages, if not
@@ -417,8 +419,7 @@ $COMMAND
             ])
             SYSTEM_PACKAGES=$(build/bin/sage-get-system-packages $SYSTEM $SAGE_NEED_SYSTEM_PACKAGES_OPTIONAL)
             AS_IF([test -n "$SYSTEM_PACKAGES"], [
-                PRINT_SYS="build/bin/sage-print-system-package-command $SYSTEM --verbose=\"    \" --prompt=\"      \$ \" --sudo"
-                COMMAND=$(eval "$PRINT_SYS" update && eval "$PRINT_SYS" install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" eval "$PRINT_SYS" setup-build-env )
+                COMMAND=$(print_sys update && print_sys install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" print_sys setup-build-env)
                 AC_MSG_NOTICE([
 
     hint: installing the following system packages, if not

pkgs/sage-conf/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sage-conf_conda/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sage-conf_pypi/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sage-docbuild/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sage-setup/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sage-sws2rst/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-bliss/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-categories/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-coxeter3/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-environment/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-mcqd/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-meataxe/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-objects/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-repl/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-sirocco/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

pkgs/sagemath-tdlib/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

src/VERSION.txt

@@ -1 +1 @@
-10.3.beta5
+10.3.beta6

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.3.beta5'
-SAGE_RELEASE_DATE='2024-01-14'
-SAGE_VERSION_BANNER='SageMath version 10.3.beta5, Release Date: 2024-01-14'
+SAGE_VERSION='10.3.beta6'
+SAGE_RELEASE_DATE='2024-01-21'
+SAGE_VERSION_BANNER='SageMath version 10.3.beta6, Release Date: 2024-01-21'