Skip to content

Commit d316add

Browse files
tobiasdieztobiasdiez
authored
Merge branch 'develop' into meson-settings
2 parents 2b6bd44 + b9e396a commit d316add

File tree

40 files changed

+49
-48
lines changed

40 files changed

+49
-48
lines changed

Diff for: ‎CITATION.cff

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title: SageMath
44
abstract: SageMath is a free open-source mathematics software system.
55
authors:
66
- name: "The SageMath Developers"
7-
version: 10.5.rc0
7+
version: 10.5.rc1
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2024-11-16
9+
date-released: 2024-11-23
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

Diff for: ‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.5.rc0, Release Date: 2024-11-16
1+
SageMath version 10.5.rc1, Release Date: 2024-11-23

Diff for: ‎build/pkgs/configure/checksums.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=87648980fa41bbd38f9bf45beb7bcdb90e12d613
3-
sha256=cb5129b2e60af70968a6d8de8937b0f9365a2146762bf34a09b4ad7a88c56b8b
2+
sha1=4b08e1c0e6b812bfbade59ef7c751619d8e44f81
3+
sha256=9ae6ed35a2391f1af02ed2c7b855670d3db0bb421a69064a2c907b4f3a584eb4

Diff for: ‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d9c38a7c581e6ed54fbe420122b8bba488b16074
1+
95eb9b8c8642831f849b5fec82a0b545a95e9ca6

Diff for: ‎build/pkgs/python3/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
zlib readline sqlite libpng bzip2 liblzma libffi openssl | xz
1+
zlib readline sqlite libpng bzip2 liblzma libffi openssl | xz pkgconf
22

33
----------
44
All lines of this file are ignored except the first.

Diff for: ‎build/pkgs/sage_conf/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-conf ~= 10.5rc0
2+
sage-conf ~= 10.5rc1

Diff for: ‎build/pkgs/sage_docbuild/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-docbuild ~= 10.5rc0
2+
sage-docbuild ~= 10.5rc1

Diff for: ‎build/pkgs/sage_setup/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-setup ~= 10.5rc0
2+
sage-setup ~= 10.5rc1

Diff for: ‎build/pkgs/sage_sws2rst/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sage-sws2rst ~= 10.5rc0
2+
sage-sws2rst ~= 10.5rc1

Diff for: ‎build/pkgs/sagelib/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-standard ~= 10.5rc0
2+
sagemath-standard ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_bliss/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-bliss ~= 10.5rc0
2+
sagemath-bliss ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_categories/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-categories ~= 10.5rc0
2+
sagemath-categories ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_coxeter3/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-coxeter3 ~= 10.5rc0
2+
sagemath-coxeter3 ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_environment/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-environment ~= 10.5rc0
2+
sagemath-environment ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_mcqd/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-mcqd ~= 10.5rc0
2+
sagemath-mcqd ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_meataxe/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-meataxe ~= 10.5rc0
2+
sagemath-meataxe ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_objects/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-objects ~= 10.5rc0
2+
sagemath-objects ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_repl/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-repl ~= 10.5rc0
2+
sagemath-repl ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_sirocco/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-sirocco ~= 10.5rc0
2+
sagemath-sirocco ~= 10.5rc1

Diff for: ‎build/pkgs/sagemath_tdlib/version_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file is updated on every release by the sage-update-version script
2-
sagemath-tdlib ~= 10.5rc0
2+
sagemath-tdlib ~= 10.5rc1

Diff for: ‎pkgs/sage-conf/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sage-conf_conda/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sage-conf_pypi/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sage-docbuild/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sage-setup/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sage-sws2rst/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-bliss/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-categories/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-coxeter3/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-environment/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-mcqd/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-meataxe/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-objects/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-repl/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-sirocco/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎pkgs/sagemath-tdlib/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎src/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.5.rc0
1+
10.5.rc1

Diff for: ‎src/bin/sage-version.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# which stops "setup.py develop" from rewriting it as a Python file.
55
:
66
# This file is auto-generated by the sage-update-version script, do not edit!
7-
SAGE_VERSION='10.5.rc0'
8-
SAGE_RELEASE_DATE='2024-11-16'
9-
SAGE_VERSION_BANNER='SageMath version 10.5.rc0, Release Date: 2024-11-16'
7+
SAGE_VERSION='10.5.rc1'
8+
SAGE_RELEASE_DATE='2024-11-23'
9+
SAGE_VERSION_BANNER='SageMath version 10.5.rc1, Release Date: 2024-11-23'

Diff for: ‎src/sage/version.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Sage version information for Python scripts
22
# This file is auto-generated by the sage-update-version script, do not edit!
3-
version = '10.5.rc0'
4-
date = '2024-11-16'
5-
banner = 'SageMath version 10.5.rc0, Release Date: 2024-11-16'
3+
version = '10.5.rc1'
4+
date = '2024-11-23'
5+
banner = 'SageMath version 10.5.rc1, Release Date: 2024-11-23'

Diff for: ‎src/sage_docbuild/conf.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -954,16 +954,17 @@ class SagecodeTransform(SphinxTransform):
954954

955955
def apply(self):
956956
if self.app.builder.tags.has('html') or self.app.builder.tags.has('inventory'):
957-
for node in self.document.findall(nodes.literal_block):
957+
for node in list(self.document.findall(nodes.literal_block)):
958958
if node.get('language') is None and node.astext().startswith('sage:'):
959959
from docutils.nodes import container as Container, label as Label, literal_block as LiteralBlock, Text
960960
from sphinx_inline_tabs._impl import TabContainer
961961
parent = node.parent
962962
index = parent.index(node)
963963
prev_node = node.previous_sibling()
964-
if isinstance(node.previous_sibling(), TabContainer):
964+
if isinstance(prev_node, TabContainer):
965965
# Make sure not to merge inline tabs for adjacent literal blocks
966-
parent.insert(index, Text(''))
966+
parent.insert(index, nodes.paragraph())
967+
prev_node = parent[index]
967968
index += 1
968969
parent.remove(node)
969970
# Tab for Sage code

0 commit comments

Comments
 (0)