Merge branch 'develop' into canonical_partition

sagemath · Nov 24, 2024 · ee8bdbd · ee8bdbd
2 parents 140fdfd + b9e396a
commit ee8bdbd
Show file tree

Hide file tree

Showing 40 changed files with 49 additions and 48 deletions.
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: 10.5.rc0
+version: 10.5.rc1
 doi: 10.5281/zenodo.8042260
-date-released: 2024-11-16
+date-released: 2024-11-23
 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.5.rc0, Release Date: 2024-11-16
+SageMath version 10.5.rc1, Release Date: 2024-11-23
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=87648980fa41bbd38f9bf45beb7bcdb90e12d613
-sha256=cb5129b2e60af70968a6d8de8937b0f9365a2146762bf34a09b4ad7a88c56b8b
+sha1=4b08e1c0e6b812bfbade59ef7c751619d8e44f81
+sha256=9ae6ed35a2391f1af02ed2c7b855670d3db0bb421a69064a2c907b4f3a584eb4
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-d9c38a7c581e6ed54fbe420122b8bba488b16074
+95eb9b8c8642831f849b5fec82a0b545a95e9ca6
diff --git a/build/pkgs/python3/dependencies b/build/pkgs/python3/dependencies
@@ -1,4 +1,4 @@
-zlib readline sqlite libpng bzip2 liblzma libffi openssl | xz
+zlib readline sqlite libpng bzip2 liblzma libffi openssl | xz pkgconf
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/sage_conf/version_requirements.txt b/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.5rc0
+sage-conf ~= 10.5rc1
diff --git a/build/pkgs/sage_docbuild/version_requirements.txt b/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.5rc0
+sage-docbuild ~= 10.5rc1
diff --git a/build/pkgs/sage_setup/version_requirements.txt b/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.5rc0
+sage-setup ~= 10.5rc1
diff --git a/build/pkgs/sage_sws2rst/version_requirements.txt b/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.5rc0
+sage-sws2rst ~= 10.5rc1
diff --git a/build/pkgs/sagelib/version_requirements.txt b/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.5rc0
+sagemath-standard ~= 10.5rc1
diff --git a/build/pkgs/sagemath_bliss/version_requirements.txt b/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.5rc0
+sagemath-bliss ~= 10.5rc1
diff --git a/build/pkgs/sagemath_categories/version_requirements.txt b/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.5rc0
+sagemath-categories ~= 10.5rc1
diff --git a/build/pkgs/sagemath_coxeter3/version_requirements.txt b/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.5rc0
+sagemath-coxeter3 ~= 10.5rc1
diff --git a/build/pkgs/sagemath_environment/version_requirements.txt b/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.5rc0
+sagemath-environment ~= 10.5rc1
diff --git a/build/pkgs/sagemath_mcqd/version_requirements.txt b/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.5rc0
+sagemath-mcqd ~= 10.5rc1
diff --git a/build/pkgs/sagemath_meataxe/version_requirements.txt b/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.5rc0
+sagemath-meataxe ~= 10.5rc1
diff --git a/build/pkgs/sagemath_objects/version_requirements.txt b/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.5rc0
+sagemath-objects ~= 10.5rc1
diff --git a/build/pkgs/sagemath_repl/version_requirements.txt b/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.5rc0
+sagemath-repl ~= 10.5rc1
diff --git a/build/pkgs/sagemath_sirocco/version_requirements.txt b/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.5rc0
+sagemath-sirocco ~= 10.5rc1
diff --git a/build/pkgs/sagemath_tdlib/version_requirements.txt b/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.5rc0
+sagemath-tdlib ~= 10.5rc1
diff --git a/pkgs/sage-conf/VERSION.txt b/pkgs/sage-conf/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sage-conf_conda/VERSION.txt b/pkgs/sage-conf_conda/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sage-conf_pypi/VERSION.txt b/pkgs/sage-conf_pypi/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sage-docbuild/VERSION.txt b/pkgs/sage-docbuild/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sage-setup/VERSION.txt b/pkgs/sage-setup/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sage-sws2rst/VERSION.txt b/pkgs/sage-sws2rst/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-categories/VERSION.txt b/pkgs/sagemath-categories/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-environment/VERSION.txt b/pkgs/sagemath-environment/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-objects/VERSION.txt b/pkgs/sagemath-objects/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-repl/VERSION.txt b/pkgs/sagemath-repl/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/src/VERSION.txt b/src/VERSION.txt
@@ -1 +1 @@
-10.5.rc0
+10.5.rc1
diff --git a/src/bin/sage-version.sh b/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.5.rc0'
-SAGE_RELEASE_DATE='2024-11-16'
-SAGE_VERSION_BANNER='SageMath version 10.5.rc0, Release Date: 2024-11-16'
+SAGE_VERSION='10.5.rc1'
+SAGE_RELEASE_DATE='2024-11-23'
+SAGE_VERSION_BANNER='SageMath version 10.5.rc1, Release Date: 2024-11-23'
diff --git a/src/sage/version.py b/src/sage/version.py
@@ -1,5 +1,5 @@
 # Sage version information for Python scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-version = '10.5.rc0'
-date = '2024-11-16'
-banner = 'SageMath version 10.5.rc0, Release Date: 2024-11-16'
+version = '10.5.rc1'
+date = '2024-11-23'
+banner = 'SageMath version 10.5.rc1, Release Date: 2024-11-23'
diff --git a/src/sage_docbuild/conf.py b/src/sage_docbuild/conf.py
@@ -954,16 +954,17 @@ class SagecodeTransform(SphinxTransform):
 
     def apply(self):
         if self.app.builder.tags.has('html') or self.app.builder.tags.has('inventory'):
-            for node in self.document.findall(nodes.literal_block):
+            for node in list(self.document.findall(nodes.literal_block)):
                 if node.get('language') is None and node.astext().startswith('sage:'):
                     from docutils.nodes import container as Container, label as Label, literal_block as LiteralBlock, Text
                     from sphinx_inline_tabs._impl import TabContainer
                     parent = node.parent
                     index = parent.index(node)
                     prev_node = node.previous_sibling()
-                    if isinstance(node.previous_sibling(), TabContainer):
+                    if isinstance(prev_node, TabContainer):
                         # Make sure not to merge inline tabs for adjacent literal blocks
-                        parent.insert(index, Text(''))
+                        parent.insert(index, nodes.paragraph())
+                        prev_node = parent[index]
                         index += 1
                     parent.remove(node)
                     # Tab for Sage code
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SageMath version 10.5.rc0, Release Date: 2024-11-16
		SageMath version 10.5.rc1, Release Date: 2024-11-23
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d9c38a7c581e6ed54fbe420122b8bba488b16074
		95eb9b8c8642831f849b5fec82a0b545a95e9ca6