Skip to content

Commit 8972309

Browse files
authored
Merge branch 'develop' into pdf-tutorial-link
2 parents b71b397 + 0fd5967 commit 8972309

File tree

147 files changed

+4315
-3438
lines changed

Some content is hidden

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

147 files changed

+4315
-3438
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,24 @@ jobs:
103103
run: pyright
104104
working-directory: ./worktree-image
105105

106-
- name: Build (fallback to non-incremental)
107-
id: build
106+
- name: Clean (fallback to non-incremental)
107+
id: clean
108108
if: always() && steps.worktree.outcome == 'success' && steps.incremental.outcome != 'success'
109109
run: |
110110
set -ex
111-
./bootstrap && make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status && make build
111+
./bootstrap && make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage && ./config.status
112+
working-directory: ./worktree-image
113+
env:
114+
MAKE: make -j2
115+
SAGE_NUM_THREADS: 2
116+
117+
- name: Build
118+
# This step is needed because building the modularized distributions installs some optional packages,
119+
# so the editable install of sagelib needs to build the corresponding optional extension modules.
120+
id: build
121+
if: always() && (steps.incremental.outcome == 'success' || steps.clean.outcome == 'success')
122+
run: |
123+
make build
112124
working-directory: ./worktree-image
113125
env:
114126
MAKE: make -j2
@@ -125,22 +137,22 @@ jobs:
125137
COLUMNS: 120
126138

127139
- name: Test all files (sage -t --all --long)
128-
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
140+
if: always() && steps.build.outcome == 'success'
129141
run: |
130142
../sage -python -m pip install coverage
131143
../sage -python -m coverage run ./bin/sage-runtests --all --long -p2 --random-seed=286735480429121101562228604801325644303
132144
working-directory: ./worktree-image/src
133145

134146
- name: Prepare coverage results
135-
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
147+
if: always() && steps.build.outcome == 'success'
136148
run: |
137149
./venv/bin/python3 -m coverage combine src/.coverage/
138150
./venv/bin/python3 -m coverage xml
139151
find . -name *coverage*
140152
working-directory: ./worktree-image
141153

142154
- name: Upload coverage to codecov
143-
if: always() && (steps.incremental.outcome == 'success' || steps.build.outcome == 'success')
155+
if: always() && steps.build.outcome == 'success'
144156
uses: codecov/codecov-action@v3
145157
with:
146158
files: ./worktree-image/coverage.xml

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.1.beta8
7+
version: 10.1.beta9
88
doi: 10.5281/zenodo.593563
9-
date-released: 2023-07-30
9+
date-released: 2023-08-05
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

README.md

Lines changed: 13 additions & 1 deletion

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.1.beta8, Release Date: 2023-07-30
1+
SageMath version 10.1.beta9, Release Date: 2023-08-05

build/pkgs/configure/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=5930a5bb8c0164176122d6ffb1143df61b990213
3-
md5=b70ab1eaa247dce59a59910ec8e89051
4-
cksum=3869087595
2+
sha1=0c03cb79520ba7f484e811aeb10ce528b3ea97d5
3+
md5=499635417f054c55dc90c9aca9494d61
4+
cksum=3916950255
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
79dc3510abb05344ac7ef23d42d1228f186b7493
1+
ffdd9f8e55c138555338187b059d80ceecc2abaf
Lines changed: 1 addition & 1 deletion
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.1b8
2+
sage-conf ~= 10.1b9
Lines changed: 1 addition & 1 deletion
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.1b8
2+
sage-docbuild ~= 10.1b9
Lines changed: 1 addition & 1 deletion
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.1b8
2+
sage-setup ~= 10.1b9
Lines changed: 1 addition & 1 deletion
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.1b8
2+
sage-sws2rst ~= 10.1b9

0 commit comments

Comments
 (0)