Merge branch 'develop' into graphs/longest_path_parameters

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

@@ -60,8 +60,8 @@ jobs:
       - name: Determine targets to build
         id: build-targets
         run: |
-          echo "uninstall_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))" >> $GITHUB_OUTPUT
-          echo "build_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.pkgs_all_changed_files }}; do echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([-_.a-z0-9]*)/[^ ]* *,\2-ensure,;'; done | sort -u))" >> $GITHUB_OUTPUT
+          echo "uninstall_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([a-z0-9][_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))" >> $GITHUB_OUTPUT
+          echo "build_targets=$(echo $(for a in '' ${{ steps.changed-packages.outputs.pkgs_all_changed_files }}; do SPKG=$(echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([a-z0-9][-_.a-z0-9]*)/[^ ]* *,\2,;'); if [ -f "build/pkgs/$SPKG/checksums.ini" -o -f "build/pkgs/$SPKG/requirements.txt" -o -f "build/pkgs/$SPKG/spkg-install" ]; then echo "$SPKG-ensure"; fi; done | sort -u))" >> $GITHUB_OUTPUT
           cat $GITHUB_OUTPUT
 
   test:

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.2.rc4
+version: 10.2
 doi: 10.5281/zenodo.593563
-date-released: 2023-11-17
+date-released: 2023-12-03
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.2.rc4, Release Date: 2023-11-17
+SageMath version 10.2, Release Date: 2023-12-03

build/bin/sage-build-env-config.in

@@ -58,6 +58,8 @@ export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
 
 export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
 
+export SAGE_HAVE_LIBJPEG="@SAGE_HAVE_LIBJPEG@"
+
 export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@"
 export CONFIGURED_SAGE_WHEELS="@SAGE_WHEELS@"
 

build/pkgs/_recommended/dependencies

@@ -1 +1 @@
-pandoc ffmpeg imagemagick texlive git
+pandoc ffmpeg imagemagick texlive git libjpeg

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=374eca6cdfb4bd3dd2d3173e300639f86407077c
-md5=5810e2d5a26f7457239a576b022b0a19
-cksum=409095104
+sha1=c769dfca6414cc453b22e64863aee153c4041e6f
+md5=b098e551614a15569894e0b99b4909ff
+cksum=2514200459

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-dcd23be6c05f8de220a8404175c6e4175842255e
+b2813506039143e6f0abe859ab67a343abf72c2e

build/pkgs/libjpeg/SPKG.rst

@@ -0,0 +1,13 @@
+libjpeg: JPEG image support
+===========================
+
+Description
+-----------
+
+This dummy package represents the image library ``libjpeg``.
+
+We do not have an SPKG for it. The purpose of this dummy package is to
+associate system package lists with it.
+
+If the system package is installed, the package ``pillow`` will include
+support for JPEG images.

build/pkgs/libjpeg/distros/alpine.txt

@@ -0,0 +1 @@
+libjpeg-turbo-dev

build/pkgs/libjpeg/distros/arch.txt

@@ -0,0 +1 @@
+libjpeg-turbo

build/pkgs/libjpeg/distros/debian.txt

@@ -0,0 +1 @@
+libjpeg-dev

build/pkgs/libjpeg/distros/fedora.txt

@@ -0,0 +1 @@
+libjpeg-turbo-devel

build/pkgs/libjpeg/distros/gentoo.txt

@@ -0,0 +1 @@
+media-libs/libjpeg-turbo

build/pkgs/libjpeg/distros/homebrew.txt

@@ -0,0 +1 @@
+jpeg-turbo

build/pkgs/libjpeg/distros/nix.txt

@@ -0,0 +1 @@
+libjpeg-turbo

build/pkgs/libjpeg/distros/opensuse.txt

@@ -0,0 +1 @@
+libjpeg-devel

build/pkgs/libjpeg/distros/slackware.txt

@@ -0,0 +1 @@
+libjpeg-turbo

build/pkgs/libjpeg/distros/void.txt

@@ -0,0 +1 @@
+libjpeg-turbo-devel

build/pkgs/libjpeg/spkg-configure.m4

@@ -0,0 +1,7 @@
+SAGE_SPKG_CONFIGURE([libjpeg], [
+    PKG_CHECK_MODULES([libjpeg], [libjpeg], [
+        AC_SUBST([SAGE_HAVE_LIBJPEG], [1])
+    ], [
+        sage_spkg_install_libjpeg=yes
+    ])
+])

build/pkgs/libjpeg/type

@@ -0,0 +1 @@
+optional

build/pkgs/pandoc/SPKG.rst

@@ -4,7 +4,7 @@ pandoc: A document converter
 Description
 -----------
 
-This script package represents the document converter pandoc.
+This dummy package represents the document converter pandoc.
 
-We do not have an SPKG for it. The purpose of this script package is to
+We do not have an SPKG for it. The purpose of this dummy package is to
 associate system package lists with it.

build/pkgs/pillow/checksums.ini

@@ -1,5 +1,5 @@
 tarball=Pillow-VERSION.tar.gz
-sha1=47c1f2179bc7de5e3413feed08f7a859854030c3
-md5=93a0585ab0ee9717a7576129bdabdf93
-cksum=3176045361
+sha1=be2dc6aeee145894f3ccbc2358a37f7849e710aa
+md5=a55618c5d2fd64048dd3ea41bc39f7cd
+cksum=3616378816
 upstream_url=https://pypi.io/packages/source/p/pillow/Pillow-VERSION.tar.gz

build/pkgs/pillow/package-version.txt

@@ -1 +1 @@
-10.0.1
+10.1.0

build/pkgs/pillow/spkg-install.in

@@ -1,11 +1,13 @@
 cd src
 
 if [ "$CONDA_PREFIX" != "" ]; then
-    # Quoted quotes so that whitespace in CONDA_PREFIX works correctly.
-    # Below we run the command line through eval.
     PILLOW_CONFIG_SETTINGS="$PILLOW_CONFIG_SETTINGS -C platform-guessing=disable"
 fi
 
-PILLOW_CONFIG_SETTINGS="-C debug=true -C jpeg=disable $PILLOW_CONFIG_SETTINGS"
+if [ "$SAGE_HAVE_LIBJPEG" != 1 ]; then
+    PILLOW_CONFIG_SETTINGS="-C jpeg=disable $PILLOW_CONFIG_SETTINGS"
+fi
+
+PILLOW_CONFIG_SETTINGS="-C debug=true $PILLOW_CONFIG_SETTINGS"
 
 eval sdh_pip_install $PILLOW_CONFIG_SETTINGS .

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.2rc4
+sage-conf ~= 10.2

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.2rc4
+sage-docbuild ~= 10.2

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.2rc4
+sage-setup ~= 10.2

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.2rc4
+sage-sws2rst ~= 10.2

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.2rc4
+sagemath-standard ~= 10.2

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.2rc4
+sagemath-bliss ~= 10.2

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.2rc4
+sagemath-categories ~= 10.2

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.2rc4
+sagemath-coxeter3 ~= 10.2

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.2rc4
+sagemath-environment ~= 10.2

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.2rc4
+sagemath-mcqd ~= 10.2

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.2rc4
+sagemath-meataxe ~= 10.2

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.2rc4
+sagemath-objects ~= 10.2

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.2rc4
+sagemath-repl ~= 10.2

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.2rc4
+sagemath-sirocco ~= 10.2

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.2rc4
+sagemath-tdlib ~= 10.2

build/sage_bootstrap/uninstall.py

@@ -172,6 +172,17 @@ def modern_uninstall(spkg_name, sage_local, files, verbose=False):
         else:
             sys.exit(1)
 
+    # Run the package's piprm script, if it exists.
+    # Since #36452 the spkg-requirements.txt file appears in the installation
+    # manifest, so this step has to happen before removing the files.
+    try:
+        run_spkg_script(spkg_name, spkg_scripts, 'piprm',
+                        'pip-uninstall')
+    except Exception:
+        print("Warning: Error running the pip-uninstall script for "
+              "'{0}'; uninstallation may have left behind some files".format(
+              spkg_name), file=sys.stderr)
+
     def rmdir(dirname):
         if pth.isdir(dirname):
             if not os.listdir(dirname):
@@ -200,15 +211,6 @@ def rmdir(dirname):
         # Remove file's directory if it is now empty
         rmdir(dirname)
 
-    # Run the package's piprm script, if it exists.
-    try:
-        run_spkg_script(spkg_name, spkg_scripts, 'piprm',
-                        'pip-uninstall')
-    except Exception:
-        print("Warning: Error running the pip-uninstall script for "
-              "'{0}'; uninstallation may have left behind some files".format(
-              spkg_name), file=sys.stderr)
-
     # Run the package's postrm script, if it exists.
     # If an error occurs here print a warning, but complete the
     # uninstallation; otherwise we leave the package in a broken

pkgs/sage-conf/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sage-conf_conda/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sage-conf_pypi/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sage-docbuild/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sage-setup/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sage-sws2rst/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-bliss/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-categories/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-coxeter3/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-environment/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-mcqd/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-meataxe/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-objects/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-repl/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-sirocco/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

pkgs/sagemath-tdlib/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

src/VERSION.txt

@@ -1 +1 @@
-10.2.rc4
+10.2

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.2.rc4'
-SAGE_RELEASE_DATE='2023-11-17'
-SAGE_VERSION_BANNER='SageMath version 10.2.rc4, Release Date: 2023-11-17'
+SAGE_VERSION='10.2'
+SAGE_RELEASE_DATE='2023-12-03'
+SAGE_VERSION_BANNER='SageMath version 10.2, Release Date: 2023-12-03'

src/sage/graphs/graph_generators.py

@@ -1130,7 +1130,7 @@ def nauty_genbg(self, options="", debug=False):
             sage: list(graphs.nauty_genbg("-c1 2", debug=True))
             ['>E Usage: ...genbg [-c -ugs -vq -lzF] [-Z#] [-D#] [-A] [-d#|-d#:#] [-D#|-D#:#] n1 n2...
             sage: list(graphs.nauty_genbg("-c 1 2", debug=True))
-            ['>A ...genbg n=1+2 e=2:2 d=1:1 D=2:1 c\n', Bipartite graph on 3 vertices]
+            ['>A ...genbg n=1+2 e=2:2 d=1:1 D=2:1 c...\n', Bipartite graph on 3 vertices]
 
         We must have n1=1..24, n2=0..32 and n1+n2=1..32 (:trac:`34179`)::
 

src/sage/quadratic_forms/quadratic_form__neighbors.py

@@ -74,6 +74,10 @@ def find_primitive_p_divisible_vector__next(self, p, v=None):
         sage: v = Q.find_primitive_p_divisible_vector__next(5, v); v
         (1, 0)
         sage: v = Q.find_primitive_p_divisible_vector__next(5, v); v
+        sage: v = Q.find_primitive_p_divisible_vector__next(2) ; v
+        (0, 1)
+        sage: v = Q.find_primitive_p_divisible_vector__next(2, v) ; v
+        (1, 0)
         sage: Q = QuadraticForm(QQ, matrix.diagonal([1,1,1,1]))
         sage: v = Q.find_primitive_p_divisible_vector__next(2)
         sage: Q(v)
@@ -83,6 +87,9 @@ def find_primitive_p_divisible_vector__next(self, p, v=None):
     n = self.dim()
     if v is None:
         w = vector(ZZ, [0] * (n - 1) + [1])
+        a = self(w)
+        if a in ZZ and (a % p == 0):
+            return w
     else:
         w = deepcopy(v)
 
@@ -132,7 +139,7 @@ def find_primitive_p_divisible_vector__next(self, p, v=None):
             return w
 
 
-def find_p_neighbor_from_vec(self, p, y):
+def find_p_neighbor_from_vec(self, p, y, return_matrix=False):
     r"""
     Return the `p`-neighbor of ``self`` defined by ``y``.
 
@@ -147,25 +154,32 @@ def find_p_neighbor_from_vec(self, p, y):
     - ``p`` -- a prime number
     - ``y`` -- a vector with `q(y) \in p \ZZ`
     - ``odd`` -- (default: ``False``) if `p=2`, return also odd neighbors
+    - ``return_matrix`` -- (boolean, default ``False``) return
+      the transformation matrix instead of the quadratic form
 
     EXAMPLES::
 
+        sage: # needs sage.libs.pari
         sage: Q = DiagonalQuadraticForm(ZZ, [1,1,1,1])
         sage: v = vector([0,2,1,1])
-        sage: X = Q.find_p_neighbor_from_vec(3, v); X                                   # needs sage.libs.pari
+        sage: X = Q.find_p_neighbor_from_vec(3, v); X
         Quadratic form in 4 variables over Integer Ring with coefficients:
         [ 1 0 0 0 ]
         [ * 1 4 4 ]
         [ * * 5 12 ]
         [ * * * 9 ]
+        sage: B = Q.find_p_neighbor_from_vec(3, v, return_matrix=True)
+        sage: Q(B) == X
+        True
 
     Since the base ring and the domain are not yet separate,
     for rational, half integral forms we just pretend
     the base ring is `\ZZ`::
 
+        sage: # needs sage.libs.pari
         sage: Q = QuadraticForm(QQ, matrix.diagonal([1,1,1,1]))
         sage: v = vector([1,1,1,1])
-        sage: Q.find_p_neighbor_from_vec(2, v)                                          # needs sage.libs.pari
+        sage: Q.find_p_neighbor_from_vec(2, v)
         Quadratic form in 4 variables over Rational Field with coefficients:
         [ 1/2 1 1 1 ]
         [ * 1 1 2 ]
@@ -227,9 +241,12 @@ def find_p_neighbor_from_vec(self, p, y):
     # by definition this is the p-neighbor of L at y
     # assert B.det().abs() == 1
 
-    QF = self.parent()
-    Gnew = (B*G*B.T).change_ring(R)
-    return QF(Gnew)
+    if return_matrix:
+        return B.T
+    else:
+        QF = self.parent()
+        Gnew = (B*G*B.T).change_ring(R)
+        return QF(Gnew)
 
 
 def neighbor_iteration(seeds, p, mass=None, max_classes=ZZ(10)**3,