Merge branch 'develop' into conftest_py_fix

.github/workflows/pyright.yml

@@ -32,7 +32,7 @@ jobs:
           eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git)
 
       - name: Install GH CLI
-        uses: dev-hanz-ops/[email protected].0
+        uses: dev-hanz-ops/[email protected].1
         with:
           gh-cli-version: 2.32.0
 

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.6.beta4
+version: 10.6.beta5
 doi: 10.5281/zenodo.8042260
-date-released: 2025-01-18
+date-released: 2025-01-26
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.6.beta4, Release Date: 2025-01-18
+SageMath version 10.6.beta5, Release Date: 2025-01-26

build/bin/sage-spkg

@@ -603,14 +603,14 @@ case "$PKG_SRC" in
 esac
 
 # Poison the proxy variable to forbid downloads in spkg-install
-# for normal packages
-case $PKG_SRC_TYPE in
-  normal|wheel)
-    export http_proxy=http://192.0.2.0:5187/
-    export https_proxy=$http_proxy
-    export ftp_proxy=$http_proxy
-    export rsync_proxy=$http_proxy
-    ;;
+# for normal/wheel standard packages
+case "$PKG_TYPE:$PKG_SRC_TYPE" in
+    standard:normal|standard:wheel)
+        export http_proxy=http://192.0.2.0:5187/
+        export https_proxy=$http_proxy
+        export ftp_proxy=$http_proxy
+        export rsync_proxy=$http_proxy
+        ;;
 esac
 
 # Make sage-logger show the full logs

build/pkgs/ccache/spkg-install.in

@@ -4,7 +4,6 @@ mkdir build
 cd build
 sdh_cmake -DCMAKE_BUILD_TYPE=Release \
           -DENABLE_TESTING=OFF \
-		  -DREDIS_STORAGE_BACKEND=OFF \
 		  ..
 sdh_make
 sdh_make_install

build/pkgs/configure/checksums.ini

@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=f9c1bea6113a6a09430ee1f1aca16c75ed427d48
-sha256=c1e0826fb54dd60e78f19e6fcad0b0ef90b33e1771fbbc2165a54c9297a89557
+sha1=86711d4cbef2cd4e7bb4afcde36965e5dea908e0
+sha256=9793cf92ebdceb09050a585294de93c242c033745a0012cae1bd301d307a45df

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-5eb37241946a9ef9130ce36eff7e4f135d980eaf
+efc0914cd8d72a9bdfdcca4511b55e290b9b6674

build/pkgs/igraph/checksums.ini

@@ -1,4 +1,4 @@
 tarball=igraph-VERSION.tar.gz
-sha1=3789f61beac1f1231f8c3832102dcb2720f2a0c9
-sha256=b011f7f9f38a3e59924cc9ff652e6d33105fa03fcaf3792f47d752626a0a4625
+sha1=af74e361167bd790ed2fcc248acd21ec946ddb2a
+sha256=03ba01db0544c4e32e51ab66f2356a034394533f61b4e14d769b9bbf5ad5e52c
 upstream_url=https://github.com/igraph/igraph/releases/download/VERSION/igraph-VERSION.tar.gz

build/pkgs/igraph/package-version.txt

@@ -1 +1 @@
-0.10.12
+0.10.15

build/pkgs/igraph/spkg-configure.m4

@@ -3,7 +3,7 @@ SAGE_SPKG_CONFIGURE([igraph], [
     dnl check for igraph with pkg-config
     dnl Per upstream in https://github.com/sagemath/sage/pull/36750#issuecomment-1826998762:
     dnl each python-igraph release is only guaranteed to be compatible with the same C/igraph that it bundles
-    PKG_CHECK_MODULES([IGRAPH], [igraph >= 0.10.12 igraph < 0.10.13], [], [
+    PKG_CHECK_MODULES([IGRAPH], [igraph >= 0.10.14 igraph < 0.10.16], [], [
         sage_spkg_install_igraph=yes])
   ])
 ])

build/pkgs/python_igraph/checksums.ini

@@ -1,4 +1,4 @@
 tarball=python-igraph-VERSION.tar.gz
-sha1=da963213ab22c60938d4e77ffab811875ee43a8a
-sha256=2d71d645a4c3344c5910543fabbae10d3163f46a3e824ba7753c14b9036b8233
+sha1=19b52531169f200ff60f2cb8245eaa9e277c6c13
+sha256=d7dc1404567ba3b0ea1bf8b5fa6e101617915c8ad11ea5a9f925a40bf4adad7d
 upstream_url=https://files.pythonhosted.org/packages/source/i/igraph/igraph-VERSION.tar.gz

build/pkgs/python_igraph/package-version.txt

@@ -1 +1 @@
-0.11.5
+0.11.8

build/pkgs/sage_conf/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-conf ~= 10.6b4
+sage-conf ~= 10.6b5

build/pkgs/sage_docbuild/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-docbuild ~= 10.6b4
+sage-docbuild ~= 10.6b5

build/pkgs/sage_setup/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-setup ~= 10.6b4
+sage-setup ~= 10.6b5

build/pkgs/sage_sws2rst/version_requirements.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-sws2rst ~= 10.6b4
+sage-sws2rst ~= 10.6b5

build/pkgs/sagelib/version_requirements.txt

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

build/pkgs/sagemath_bliss/version_requirements.txt

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

build/pkgs/sagemath_categories/version_requirements.txt

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

build/pkgs/sagemath_coxeter3/version_requirements.txt

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

build/pkgs/sagemath_environment/version_requirements.txt

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

build/pkgs/sagemath_mcqd/version_requirements.txt

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

build/pkgs/sagemath_meataxe/version_requirements.txt

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

build/pkgs/sagemath_objects/version_requirements.txt

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

build/pkgs/sagemath_repl/version_requirements.txt

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

build/pkgs/sagemath_sirocco/version_requirements.txt

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

build/pkgs/sagemath_tdlib/version_requirements.txt

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

build/sage_bootstrap/download/mirror_list.py

@@ -170,7 +170,8 @@ def _rank_mirrors(self):
         This method is used by the YUM fastestmirror plugin
         """
         timed_mirrors = []
-        import time, socket
+        import time
+        import socket
         log.info('Searching fastest mirror')
         timeout = 1
         for mirror in self.mirrors:

pkgs/sage-conf/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sage-conf_conda/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sage-conf_conda/setup.py

@@ -38,7 +38,7 @@ def run(self):
                 print("Warning: A configuration has been written, but the configure script has exited with an error. "
                       "Carefully check any messages above before continuing.")
             else:
-                print(f"Error: The configure script has failed; this may be caused by missing build prerequisites.")
+                print("Error: The configure script has failed; this may be caused by missing build prerequisites.")
                 sys.stdout.flush()
                 PREREQ_SPKG = "_prereq bzip2 xz libffi"  # includes python3 SPKG_DEPCHECK packages
                 os.system(f'cd {SAGE_ROOT} && export PACKAGES="$(build/bin/sage-get-system-packages conda {PREREQ_SPKG})" && [ -n "$PACKAGES" ] && echo "You can install the required build prerequisites using the following shell command" && echo "" && build/bin/sage-print-system-package-command conda --verbose --sudo install $PACKAGES && echo ""')
@@ -73,7 +73,7 @@ def _create_writable_sage_root(self):
 
         def ignore(path, names):
             # exclude all embedded src trees
-            if fnmatch.fnmatch(path, f'*/build/pkgs/*'):
+            if fnmatch.fnmatch(path, '*/build/pkgs/*'):
                 return ['src']
             ### ignore more stuff --- .tox etc.
             return [name for name in names

pkgs/sage-conf_pypi/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sage-conf_pypi/setup.py

@@ -47,7 +47,7 @@ def run(self):
             print(f"Running {cmd}")
             sys.stdout.flush()
             if os.system(cmd) != 0:
-                print(f"configure failed; this may be caused by missing build prerequisites.")
+                print("configure failed; this may be caused by missing build prerequisites.")
                 sys.stdout.flush()
                 PREREQ_SPKG = "_prereq bzip2 xz libffi"  # includes python3 SPKG_DEPCHECK packages
                 os.system(f'cd {SAGE_ROOT} && export SYSTEM=$(build/bin/sage-guess-package-system 2>/dev/null) && export PACKAGES="$(build/bin/sage-get-system-packages $SYSTEM {PREREQ_SPKG})" && [ -n "$PACKAGES" ] && echo "You can install the required build prerequisites using the following shell command" && echo "" && build/bin/sage-print-system-package-command $SYSTEM --verbose --sudo install $PACKAGES && echo ""')
@@ -95,7 +95,7 @@ def _create_writable_sage_root(self):
 
         def ignore(path, names):
             # exclude all embedded src trees
-            if fnmatch.fnmatch(path, f'*/build/pkgs/*'):
+            if fnmatch.fnmatch(path, '*/build/pkgs/*'):
                 return ['src']
             ### ignore more stuff --- .tox etc.
             return [name for name in names

pkgs/sage-docbuild/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sage-setup/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sage-sws2rst/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sage-sws2rst/sage_sws2rst/worksheet2rst.py

@@ -111,7 +111,8 @@ def code_parser(text):
     lines = ['::', '']
     for s in text.splitlines():
         l = s[6:] if s.startswith('sage: ') else s
-        if not l: continue
+        if not l:
+            continue
         prefix = '    ....: ' if l[0] == ' ' else '    sage: '
         lines.append(prefix + l)
     return '\n'.join(lines)

pkgs/sagemath-bliss/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sagemath-categories/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sagemath-coxeter3/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sagemath-environment/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sagemath-mcqd/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sagemath-meataxe/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sagemath-objects/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sagemath-repl/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sagemath-sirocco/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

pkgs/sagemath-tdlib/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

src/VERSION.txt

@@ -1 +1 @@
-10.6.beta4
+10.6.beta5

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.6.beta4'
-SAGE_RELEASE_DATE='2025-01-18'
-SAGE_VERSION_BANNER='SageMath version 10.6.beta4, Release Date: 2025-01-18'
+SAGE_VERSION='10.6.beta5'
+SAGE_RELEASE_DATE='2025-01-26'
+SAGE_VERSION_BANNER='SageMath version 10.6.beta5, Release Date: 2025-01-26'

src/doc/de/tutorial/interfaces.rst

@@ -198,8 +198,8 @@ Sages Singular-Schnittstelle (ohne die ``....:``):
     sage: R1 = singular.ring(0, '(x,y)', 'dp')
     sage: R1
     polynomial ring, over a field, global ordering
-    //   coefficients: QQ
-    //   number of vars : 2
+    // coefficients: QQ...
+    // number of vars : 2
     //        block   1 : ordering dp
     //                  : names    x y
     //        block   2 : ordering C

src/doc/de/tutorial/tour_advanced.rst

@@ -35,11 +35,11 @@ wir diese schneiden und dann die irreduziblen Komponenten berechnen.
     sage: V = C2.intersection(C3)
     sage: V.irreducible_components()
     [Closed subscheme of Affine Space of dimension 2 over Rational Field defined by:
-       y,
-       x - 1,
-     Closed subscheme of Affine Space of dimension 2 over Rational Field defined by:
        y - 1,
        x,
+     Closed subscheme of Affine Space of dimension 2 over Rational Field defined by:
+       y,
+       x - 1,
      Closed subscheme of Affine Space of dimension 2 over Rational Field defined by:
        x + y + 2,
        2*y^2 + 4*y + 3]

src/doc/el/a_tour_of_sage/conf.py

@@ -27,8 +27,8 @@
 
 # Add small view/edit buttons.
 html_theme_options.update({
-  'source_view_link': os.path.join(source_repository, f'blob/develop/src/doc/el/a_tour_of_sage', '{filename}'),
-  'source_edit_link': os.path.join(source_repository, f'edit/develop/src/doc/el/a_tour_of_sage', '{filename}'),
+  'source_view_link': os.path.join(source_repository, 'blob/develop/src/doc/el/a_tour_of_sage', '{filename}'),
+  'source_edit_link': os.path.join(source_repository, 'edit/develop/src/doc/el/a_tour_of_sage', '{filename}'),
 })
 
 # General information about the project.

src/doc/en/a_tour_of_sage/conf.py

@@ -27,8 +27,8 @@
 
 # Add small view/edit buttons.
 html_theme_options.update({
-  'source_view_link': os.path.join(source_repository, f'blob/develop/src/doc/en/a_tour_of_sage', '{filename}'),
-  'source_edit_link': os.path.join(source_repository, f'edit/develop/src/doc/en/a_tour_of_sage', '{filename}'),
+  'source_view_link': os.path.join(source_repository, 'blob/develop/src/doc/en/a_tour_of_sage', '{filename}'),
+  'source_edit_link': os.path.join(source_repository, 'edit/develop/src/doc/en/a_tour_of_sage', '{filename}'),
 })
 
 # General information about the project.

src/doc/en/constructions/algebraic_geometry.rst

@@ -162,14 +162,12 @@ Other methods
 
        sage: singular.LIB("brnoeth.lib")
        sage: s = singular.ring(2,'(x,y)','lp')
-       ...
        sage: f = singular.poly('x3y+y3+x')
-       ...
        sage: klein1 = f.Adj_div(); print(klein1)
        [1]:
           [1]:
-             //   coefficients: ZZ/2
-       //   number of vars : 2
+             // coefficients: ZZ/2...
+       // number of vars : 2
        //        block   1 : ordering lp
        //                  : names    x y
        //        block   2 : ordering C
@@ -191,14 +189,14 @@ Other methods
        sage: print(klein1)
        [1]:
           [1]:
-             //   coefficients: ZZ/2
-       //   number of vars : 2
+             // coefficients: ZZ/2...
+       // number of vars : 2
        //        block   1 : ordering lp
        //                  : names    x y
        //        block   2 : ordering C
           [2]:
-             //   coefficients: ZZ/2
-       //   number of vars : 3
+             // coefficients: ZZ/2...
+       // number of vars : 3
        //        block   1 : ordering lp
        //                  : names    x y z
        //        block   2 : ordering C
@@ -214,8 +212,8 @@ Other methods
        [5]:
           [1]:
              [1]:
-                //   coefficients: ZZ/2
-       //   number of vars : 3
+                // coefficients: ZZ/2...
+       // number of vars : 3
        //        block   1 : ordering ls
        //                  : names    x y t
        //        block   2 : ordering C

src/doc/en/constructions/rings.rst

@@ -57,8 +57,8 @@ Here's an example using the Singular interface:
     sage: I = singular.ideal(['a+b+c+d', 'ab+ad+bc+cd', 'abc+abd+acd+bcd', 'abcd-1'])
     sage: R
     polynomial ring, over a field, global ordering
-    //   coefficients: ZZ/97
-    //   number of vars : 4
+    // coefficients: ZZ/97...
+    // number of vars : 4
     //        block   1 : ordering lp
     //                  : names    a b c d
     //        block   2 : ordering C

src/doc/en/developer/coding_in_other.rst

@@ -403,8 +403,8 @@ interface to Singular::
     sage: singular.LIB("brnoeth.lib")
     sage: singular.ring(5,'(x,y)','lp')
         polynomial ring, over a field, global ordering
-        //   coefficients: ZZ/5
-        //   number of vars : 2
+        // coefficients: ZZ/5...
+        // number of vars : 2
         //        block   1 : ordering lp
         //                  : names    x y
         //        block   2 : ordering C