Skip to content

Commit b0eb971

Browse files
authored
Merge branch 'sagemath:develop' into lins
2 parents a02931c + 276aa66 commit b0eb971

File tree

219 files changed

+9311
-2130
lines changed

Some content is hidden

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

219 files changed

+9311
-2130
lines changed

.ci/write-dockerfile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ cat <<EOF
275275
FROM with-system-packages AS bootstrapped
276276
#:bootstrapping:
277277
RUN rm -rf /new /sage/.git
278-
$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
278+
$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap conftest.py configure_wrapper configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
279279
$ADD config/config.rpath /new/config/config.rpath
280280
$ADD src/doc/bootstrap /new/src/doc/bootstrap
281281
$ADD src/bin /new/src/bin

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104

105105
- name: Get changed files and packages
106106
id: changed-files
107-
uses: tj-actions/changed-files@v45
107+
uses: tj-actions/changed-files@v46
108108
with:
109109
# File extensions for doctests per sage.doctest.control.skipfile
110110
# Also src/sage/doctests/tests/ are excluded because of nodoctest file
@@ -311,6 +311,8 @@ jobs:
311311

312312
- name: Generate Dockerfile
313313
# From docker.yml
314+
# tox -e <environment name> command runs commands in `tox.ini`,
315+
# in particular the script `.ci/write-dockerfile.sh`, to generate `Dockerfile`.
314316
run: |
315317
tox -e ${{ env.TOX_ENV }}
316318
cp .tox/${{ env.TOX_ENV }}/Dockerfile .

.github/workflows/ci-linux-incremental.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- uses: actions/checkout@v4
4747
- name: Get all packages that have changed
4848
id: changed-files
49-
uses: tj-actions/changed-files@v45
49+
uses: tj-actions/changed-files@v46
5050
with:
5151
files_yaml: |
5252
configures:

.github/workflows/ci-meson.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ubuntu]
25+
os: [ubuntu, macos]
2626
python: ['3.11', '3.12']
2727
editable:
2828
${{ fromJson(github.event_name == 'pull_request' && '[false]' || '[false, true]') }}

.github/workflows/doc-build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,10 @@ jobs:
173173
-e 's;'"$mathjax_path_from"';'"$mathjax_path_to"';' \
174174
-e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d' \
175175
-e 's;#L[0-9]*";";' \
176-
-e 's;tab-set--[0-9]*-;tab-set-;' \
176+
-e 's;tab-set--[0-9]*-;tab-set-;g' \
177+
-e 's;"tab-set--[0-9]*";"tab-set";' \
177178
&& true)
179+
# If the regex list above is changed, the sed command in "Copy doc" step should also be changed
178180
# Create git repo from old doc
179181
(cd doc && \
180182
git init && \
@@ -229,9 +231,10 @@ jobs:
229231
-e 's;?v=[0-9a-f]*";";' \
230232
-e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d' \
231233
-e 's;#L[0-9]*";";' \
232-
-e 's;tab-set--[0-9]*-;tab-set-;' \
234+
-e 's;tab-set--[0-9]*-;tab-set-;g' \
233235
-e 's;"tab-set--[0-9]*";"tab-set";' \
234236
&& git commit -a -m 'wipe-out')
237+
# If the regex list above is changed, the sed command in "Store old doc" step should also be changed
235238
# Since HEAD is at commit 'wipe-out', HEAD~1 is commit 'new' (new doc), HEAD~2 is commit 'old' (old doc)
236239
(cd doc && git diff $(git rev-parse HEAD~2) -- "*.html") > diff.txt
237240
# Restore the new doc dropping changes by "wipe out"

.github/workflows/docker.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,13 @@ on:
2323
"ubuntu-jammy",
2424
"debian-bullseye",
2525
"debian-bookworm",
26-
"linuxmint-20.2",
27-
"linuxmint-20.3",
28-
"linuxmint-21",
29-
"linuxmint-21.1",
30-
"linuxmint-21.2",
31-
"linuxmint-21.3",
3226
"fedora-40",
3327
"fedora-41",
3428
"centos-stream-9",
3529
"centos-stream-9-python3.12",
3630
"almalinux-9-python3.11",
3731
"archlinux-latest",
3832
"opensuse-15.5-gcc_11-python3.11",
39-
"opensuse-tumbleweed-python3.10",
4033
"opensuse-tumbleweed",
4134
]
4235
# 'tox -e update_docker_platforms' updates above

.github/workflows/lint.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,19 @@ jobs:
2626
.ci/merge-fixes.sh
2727
env:
2828
GH_TOKEN: ${{ github.token }}
29-
SAGE_CI_FIXES_FROM_REPOSITORIES: ${{ vars.SAGE_CI_FIXES_FROM_REPOSITORIES }}
3029

31-
- name: Install test prerequisites
30+
- name: Install prerequisites
3231
id: deps
33-
# From docker.yml
34-
run: |
35-
sudo DEBIAN_FRONTEND=noninteractive apt-get update
36-
sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
32+
run: pip install uv
3733

3834
- name: Code style check with ruff-minimal
3935
if: (success() || failure()) && steps.deps.outcome == 'success'
40-
run: tox -e ruff-minimal
41-
env:
42-
# https://github.com/ChartBoost/ruff-action/issues/7#issuecomment-1887780308
43-
RUFF_OUTPUT_FORMAT: github
44-
45-
- name: Code style check with pycodestyle-minimal
46-
if: (success() || failure()) && steps.deps.outcome == 'success'
47-
run: tox -e pycodestyle-minimal
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
4837

4938
- name: Code style check with relint
5039
if: (success() || failure()) && steps.deps.outcome == 'success'
51-
run: tox -e relint -- src/sage/
40+
run: uv run --frozen --only-group lint -- relint -c src/.relint.yml -- src/sage/
5241

5342
- name: Validate docstring markup as RST
5443
if: (success() || failure()) && steps.deps.outcome == 'success'
55-
run: tox -e rst
44+
run: uv run --frozen --only-group lint -- flake8 --select=RST src/sage/ --config src/tox.ini

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/config.log
1919
/config.status
2020
/configure
21+
/real_configure
2122
/confdefs.h
2223

2324
/m4/sage_spkg_configures.m4

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.6.beta9
7+
version: 10.6.rc0
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2025-03-09
9+
date-released: 2025-03-22
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.6.beta9, Release Date: 2025-03-09
1+
SageMath version 10.6.rc0, Release Date: 2025-03-22

0 commit comments

Comments
 (0)