Skip to content

Commit 0ed925b

Browse files
user202729user202729
committed
Merge remote-tracking branch 'upstream/develop' into remove-doctest-backslash-hack
2 parents 1a9b002 + dc99dc8 commit 0ed925b

File tree

253 files changed

+4375
-1947
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+4375
-1947
lines changed

‎.github/workflows/pyright.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git)
3333
3434
- name: Install GH CLI
35-
uses: dev-hanz-ops/[email protected].0
35+
uses: dev-hanz-ops/[email protected].1
3636
with:
3737
gh-cli-version: 2.32.0
3838

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

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.6.beta4, Release Date: 2025-01-18
1+
SageMath version 10.6.beta5, Release Date: 2025-01-26

‎build/bin/sage-spkg

+8-8
Original file line numberDiff line numberDiff line change
@@ -603,14 +603,14 @@ case "$PKG_SRC" in
603603
esac
604604
605605
# Poison the proxy variable to forbid downloads in spkg-install
606-
# for normal packages
607-
case $PKG_SRC_TYPE in
608-
normal|wheel)
609-
export http_proxy=http://192.0.2.0:5187/
610-
export https_proxy=$http_proxy
611-
export ftp_proxy=$http_proxy
612-
export rsync_proxy=$http_proxy
613-
;;
606+
# for normal/wheel standard packages
607+
case "$PKG_TYPE:$PKG_SRC_TYPE" in
608+
standard:normal|standard:wheel)
609+
export http_proxy=http://192.0.2.0:5187/
610+
export https_proxy=$http_proxy
611+
export ftp_proxy=$http_proxy
612+
export rsync_proxy=$http_proxy
613+
;;
614614
esac
615615
616616
# Make sage-logger show the full logs

‎build/pkgs/ccache/spkg-install.in

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ mkdir build
44
cd build
55
sdh_cmake -DCMAKE_BUILD_TYPE=Release \
66
-DENABLE_TESTING=OFF \
7-
-DREDIS_STORAGE_BACKEND=OFF \
87
..
98
sdh_make
109
sdh_make_install

‎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=f9c1bea6113a6a09430ee1f1aca16c75ed427d48
3-
sha256=c1e0826fb54dd60e78f19e6fcad0b0ef90b33e1771fbbc2165a54c9297a89557
2+
sha1=86711d4cbef2cd4e7bb4afcde36965e5dea908e0
3+
sha256=9793cf92ebdceb09050a585294de93c242c033745a0012cae1bd301d307a45df

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5eb37241946a9ef9130ce36eff7e4f135d980eaf
1+
efc0914cd8d72a9bdfdcca4511b55e290b9b6674

‎build/pkgs/igraph/checksums.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=igraph-VERSION.tar.gz
2-
sha1=3789f61beac1f1231f8c3832102dcb2720f2a0c9
3-
sha256=b011f7f9f38a3e59924cc9ff652e6d33105fa03fcaf3792f47d752626a0a4625
2+
sha1=af74e361167bd790ed2fcc248acd21ec946ddb2a
3+
sha256=03ba01db0544c4e32e51ab66f2356a034394533f61b4e14d769b9bbf5ad5e52c
44
upstream_url=https://github.com/igraph/igraph/releases/download/VERSION/igraph-VERSION.tar.gz

‎build/pkgs/igraph/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.10.12
1+
0.10.15

‎build/pkgs/igraph/spkg-configure.m4

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

‎build/pkgs/python_igraph/checksums.ini

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

‎build/pkgs/python_igraph/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.11.5
1+
0.11.8

‎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.6b4
2+
sage-conf ~= 10.6b5

‎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.6b4
2+
sage-docbuild ~= 10.6b5

‎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.6b4
2+
sage-setup ~= 10.6b5

‎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.6b4
2+
sage-sws2rst ~= 10.6b5

‎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.6b4
2+
sagemath-standard ~= 10.6b5

‎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.6b4
2+
sagemath-bliss ~= 10.6b5

‎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.6b4
2+
sagemath-categories ~= 10.6b5

‎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.6b4
2+
sagemath-coxeter3 ~= 10.6b5

‎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.6b4
2+
sagemath-environment ~= 10.6b5

‎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.6b4
2+
sagemath-mcqd ~= 10.6b5

‎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.6b4
2+
sagemath-meataxe ~= 10.6b5

‎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.6b4
2+
sagemath-objects ~= 10.6b5

‎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.6b4
2+
sagemath-repl ~= 10.6b5

‎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.6b4
2+
sagemath-sirocco ~= 10.6b5

‎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.6b4
2+
sagemath-tdlib ~= 10.6b5

‎build/sage_bootstrap/download/mirror_list.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ def _rank_mirrors(self):
170170
This method is used by the YUM fastestmirror plugin
171171
"""
172172
timed_mirrors = []
173-
import time, socket
173+
import time
174+
import socket
174175
log.info('Searching fastest mirror')
175176
timeout = 1
176177
for mirror in self.mirrors:

‎pkgs/sage-conf/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sage-conf_conda/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sage-conf_conda/setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def run(self):
3838
print("Warning: A configuration has been written, but the configure script has exited with an error. "
3939
"Carefully check any messages above before continuing.")
4040
else:
41-
print(f"Error: The configure script has failed; this may be caused by missing build prerequisites.")
41+
print("Error: The configure script has failed; this may be caused by missing build prerequisites.")
4242
sys.stdout.flush()
4343
PREREQ_SPKG = "_prereq bzip2 xz libffi" # includes python3 SPKG_DEPCHECK packages
4444
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):
7373

7474
def ignore(path, names):
7575
# exclude all embedded src trees
76-
if fnmatch.fnmatch(path, f'*/build/pkgs/*'):
76+
if fnmatch.fnmatch(path, '*/build/pkgs/*'):
7777
return ['src']
7878
### ignore more stuff --- .tox etc.
7979
return [name for name in names

‎pkgs/sage-conf_pypi/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sage-conf_pypi/setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def run(self):
4747
print(f"Running {cmd}")
4848
sys.stdout.flush()
4949
if os.system(cmd) != 0:
50-
print(f"configure failed; this may be caused by missing build prerequisites.")
50+
print("configure failed; this may be caused by missing build prerequisites.")
5151
sys.stdout.flush()
5252
PREREQ_SPKG = "_prereq bzip2 xz libffi" # includes python3 SPKG_DEPCHECK packages
5353
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):
9595

9696
def ignore(path, names):
9797
# exclude all embedded src trees
98-
if fnmatch.fnmatch(path, f'*/build/pkgs/*'):
98+
if fnmatch.fnmatch(path, '*/build/pkgs/*'):
9999
return ['src']
100100
### ignore more stuff --- .tox etc.
101101
return [name for name in names

‎pkgs/sage-docbuild/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sage-setup/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sage-sws2rst/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sage-sws2rst/sage_sws2rst/worksheet2rst.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ def code_parser(text):
111111
lines = ['::', '']
112112
for s in text.splitlines():
113113
l = s[6:] if s.startswith('sage: ') else s
114-
if not l: continue
114+
if not l:
115+
continue
115116
prefix = ' ....: ' if l[0] == ' ' else ' sage: '
116117
lines.append(prefix + l)
117118
return '\n'.join(lines)

‎pkgs/sagemath-bliss/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sagemath-categories/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sagemath-coxeter3/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sagemath-environment/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sagemath-mcqd/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sagemath-meataxe/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sagemath-objects/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sagemath-repl/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sagemath-sirocco/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎pkgs/sagemath-tdlib/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

‎src/VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.6.beta4
1+
10.6.beta5

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

‎src/doc/de/tutorial/interfaces.rst

+2-2

‎src/doc/de/tutorial/tour_advanced.rst

+3-3

‎src/doc/el/a_tour_of_sage/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
# Add small view/edit buttons.
2929
html_theme_options.update({
30-
'source_view_link': os.path.join(source_repository, f'blob/develop/src/doc/el/a_tour_of_sage', '{filename}'),
31-
'source_edit_link': os.path.join(source_repository, f'edit/develop/src/doc/el/a_tour_of_sage', '{filename}'),
30+
'source_view_link': os.path.join(source_repository, 'blob/develop/src/doc/el/a_tour_of_sage', '{filename}'),
31+
'source_edit_link': os.path.join(source_repository, 'edit/develop/src/doc/el/a_tour_of_sage', '{filename}'),
3232
})
3333

3434
# General information about the project.

‎src/doc/en/a_tour_of_sage/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
# Add small view/edit buttons.
2929
html_theme_options.update({
30-
'source_view_link': os.path.join(source_repository, f'blob/develop/src/doc/en/a_tour_of_sage', '{filename}'),
31-
'source_edit_link': os.path.join(source_repository, f'edit/develop/src/doc/en/a_tour_of_sage', '{filename}'),
30+
'source_view_link': os.path.join(source_repository, 'blob/develop/src/doc/en/a_tour_of_sage', '{filename}'),
31+
'source_edit_link': os.path.join(source_repository, 'edit/develop/src/doc/en/a_tour_of_sage', '{filename}'),
3232
})
3333

3434
# General information about the project.

‎src/doc/en/constructions/algebraic_geometry.rst

+8-10

‎src/doc/en/constructions/rings.rst

+2-2

‎src/doc/en/developer/coding_in_other.rst

+2-2

0 commit comments

Comments
 (0)