Skip to content

Commit cb74be5

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 1b91765 + 3ec79ff commit cb74be5

File tree

272 files changed

+3769
-2112
lines changed

Some content is hidden

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

272 files changed

+3769
-2112
lines changed

.github/sync_labels.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from json import loads
2323
from enum import Enum
2424
from datetime import datetime, timedelta
25+
import subprocess
2526
from subprocess import check_output, CalledProcessError
2627

2728
datetime_format = '%Y-%m-%dT%H:%M:%SZ'
@@ -631,14 +632,16 @@ def gh_cmd(self, cmd, arg, option):
631632
issue = 'issue'
632633
if self._pr:
633634
issue = 'pr'
635+
# workaround for gh bug https://github.com/cli/cli/issues/11055, it cannot deduce repo from url automatically
636+
repo = '/'.join(self._url.split('/')[:5])
634637
if arg:
635-
cmd_str = 'gh %s %s %s %s "%s"' % (issue, cmd, self._url, option, arg)
638+
cmd_str = 'gh --repo %s %s %s %s %s "%s"' % (repo, issue, cmd, self._url, option, arg)
636639
else:
637-
cmd_str = 'gh %s %s %s %s' % (issue, cmd, self._url, option)
640+
cmd_str = 'gh --repo %s %s %s %s %s' % (repo, issue, cmd, self._url, option)
638641
debug('Execute command: %s' % cmd_str)
639642
ex_code = os.system(cmd_str)
640643
if ex_code:
641-
warning('Execution of %s failed with exit code: %s' % (cmd_str, ex_code))
644+
raise RuntimeError('Execution of %s failed with exit code: %s' % (cmd_str, ex_code))
642645

643646
def edit(self, arg, option):
644647
r"""

.github/workflows/lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ jobs:
3333

3434
- name: Code style check with ruff-minimal
3535
if: (success() || failure()) && steps.deps.outcome == 'success'
36-
run: uv run --frozen --only-group lint -- ruff check --output-format github --ignore E402,E721,E731,E741,E742,E743,F401,F402,F403,F405,F821,F841,I001,PLC0206,PLC0208,PLC2401,PLC3002,PLE0302,PLR0124,PLR0402,PLR0911,PLR0912,PLR0913,PLR0915,PLR1704,PLR1711,PLR1714,PLR1716,PLR1736,PLR2004,PLR5501,PLW0120,PLW0211,PLW0602,PLW0603,PLW0642,PLW1508,PLW1510,PLW2901,PLW3301
36+
run: |
37+
uv run --frozen --only-group lint -- ruff check --output-format github --ignore E402,E721,E731,E741,E742,E743,F401,F402,F403,F405,F821,F841,I001,PLC0206,PLC0208,PLC2401,PLC3002,PLE0302,PLR0124,PLR0402,PLR0911,PLR0912,PLR0913,PLR0915,PLR1704,PLR1711,PLR1714,PLR1716,PLR1736,PLR2004,PLR5501,PLW0120,PLW0211,PLW0602,PLW0603,PLW0642,PLW1508,PLW1510,PLW2901,PLW3301
38+
uv run --frozen --only-group lint -- ruff check --output-format github --preview --select E111,E115,E21,E221,E222,E225,E227,E228,E25,E271,E272,E275,E302,E303,E305,E306,E401,E502,E701,E702,E703,E71,W291,W293,W391,W605 src/sage/
3739
3840
- name: Code style check with relint
3941
if: (success() || failure()) && steps.deps.outcome == 'success'

.github/workflows/sync_labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
files: .github/sync_labels.py
3131

3232
# Set special sync_labels bot token
33-
- name: Get Tocken
33+
- name: Get Token
3434
run: |
3535
TOKEN="${{ secrets.SYNC_LABELS_BOT_TOKEN }}"
3636
if [ -z "$TOKEN" ]; then

CITATION.cff

Lines changed: 2 additions & 2 deletions
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.7.beta5
7+
version: 10.7.beta6
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-06-01
9+
date-released: 2025-06-14
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ in the Installation Guide.
217217
for a discussion of suitable compilers.
218218

219219
- Build tools: GNU `make`, GNU `m4`, `perl` (including
220-
`ExtUtils::MakeMaker`), `ranlib`, `git`, `tar`, `bc`, `patch`.
220+
`ExtUtils::MakeMaker`), `ranlib`, `git`, `tar`, `bc`, `patch`, `bzip2`.
221+
221222
See [build/pkgs/_prereq/SPKG.rst](build/pkgs/_prereq/SPKG.rst) for
222223
more details.
223224

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.7.beta5, Release Date: 2025-06-01
1+
SageMath version 10.7.beta6, Release Date: 2025-06-14

build/make/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ all-sageruntime: toolchain-deps
349349
#
350350
# This consists of packages which are required for the Sage build system.
351351
###############################################################################
352-
base: $(inst_patch) $(inst_pkgconf)
352+
base: $(inst_pkgconf)
353353

354354
###############################################################################
355355
# Building the documentation
@@ -577,7 +577,7 @@ pkg_deps = \
577577
#
578578
# For example, for python3 this will expand to:
579579
#
580-
# $(INST)/python3-3.7.3: $(inst_zlib) $(inst_readline) $(inst_sqlite) $(inst_libpng) $(inst_bzip2) $(inst_xz) $(inst_libffi)
580+
# $(INST)/python3-3.7.3: $(inst_zlib) $(inst_readline) $(inst_sqlite) $(inst_libpng) $(inst_xz) $(inst_libffi)
581581
# +$(AM_V_at)sage-logger -p '$(SAGE_SPKG) python3-3.7.3' '$(SAGE_LOGS)/python3-3.7.3.log'
582582
#
583583
# python3: $(INST)/python3-3.7.3

build/pkgs/_prereq/SPKG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ computer:
2020
- **python**: Python 3.4 or later, or Python 2.7.
2121
(This range of versions is a minimal requirement for internal purposes of the SageMath
2222
build system, which is referred to as ``sage-bootstrap-python``.)
23+
- **patch**.
24+
- **bzip2**: the executable ``bzip2`` and the library ``libbz2`` with its headers.
25+
(some Linux distros package these separately, e.g. Debian/Ubuntu needs
26+
packages ``bzip2`` and ``libbz2-dev``; Fedora needs ``bzip2`` and ``bzip2-devel``.)
2327

2428
Other versions of these may work, but they are untested.
2529

build/pkgs/_prereq/distros/alpine.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ g++
1919
ca-certificates
2020
coreutils
2121
patch
22+
bzip2

build/pkgs/_prereq/distros/arch.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ python # system python for bootstrapping the build
1515
tar
1616
bc
1717
gcc
18+
bzip2
1819
# Needed for 4ti2:
1920
which
2021
patch

0 commit comments

Comments
 (0)