Skip to content

Commit ac37b17

Browse files
committed
fix conflicts in finitely_presented.py
2 parents 034c1b5 + 6ea1fe9 commit ac37b17

File tree

382 files changed

+5940
-4276
lines changed

Some content is hidden

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

382 files changed

+5940
-4276
lines changed

.github/workflows/doc-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ jobs:
8282
# incremental docbuild may introduce broken links (inter-file references) though build succeeds
8383
run: |
8484
set -ex
85+
export SAGE_USE_CDNS=yes
8586
mv /sage/local/share/doc/sage/html/en/.git /sage/.git-doc
8687
make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage
8788
mkdir -p /sage/local/share/doc/sage/html/en/ && mv /sage/.git-doc /sage/local/share/doc/sage/html/en/.git

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.2.beta0
7+
version: 10.2.beta1
88
doi: 10.5281/zenodo.593563
9-
date-released: 2023-08-27
9+
date-released: 2023-09-01
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.2.beta0, Release Date: 2023-08-27
1+
SageMath version 10.2.beta1, Release Date: 2023-09-01

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=d0a3737795390fc46d2cec3bf0f8c6548da2e08f
3-
md5=10be304a3521209b8c8590824ef76587
4-
cksum=602858466
2+
sha1=80ee52a3b6855149693204f0816bd0690947e7ae
3+
md5=4292c175bba9299bd057980cec7060fd
4+
cksum=3914108326
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b1ba78aff8355d0e4fc4cdea6ec08a521303e327
1+
57852a89c5c274ec6dbdd9269042972c7343e3ec

build/pkgs/mathjax/distros/gentoo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
>=dev-libs/mathjax-3
1+
">=dev-libs/mathjax-3"
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.2b0
2+
sage-conf ~= 10.2b1
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.2b0
2+
sage-docbuild ~= 10.2b1
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.2b0
2+
sage-setup ~= 10.2b1
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.2b0
2+
sage-sws2rst ~= 10.2b1

0 commit comments

Comments
 (0)