Skip to content

Commit d03c94c

Browse files
authored
Merge branch 'develop' into unicode_art_table
2 parents e09a95f + e249bef commit d03c94c

File tree

1,257 files changed

+9854
-8755
lines changed

Some content is hidden

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

1,257 files changed

+9854
-8755
lines changed

.ci/create-changes-html.sh

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,27 @@ for block in diff_blocks:
6262
match = re.search(r'^diff --git a/(.*) b/\1', block, flags=re.MULTILINE)
6363
if match:
6464
doc = match.group(1)
65-
path = 'html/' + doc
6665
file_path = os.path.join('$DOC_REPOSITORY', doc)
67-
with open(file_path, 'r') as file:
68-
content = file.readlines()
66+
try:
67+
with open(file_path, 'r') as file:
68+
content = file.readlines()
69+
except FileNotFoundError:
70+
content = []
6971
count = 0
7072
for line in block.splitlines():
7173
if line.startswith('@@ -'):
72-
line_number = int(re.search(r'@@ -(\d+)', line).group(1))
73-
for i in range(line_number, -1, -1):
74-
if content[i].startswith('<'):
75-
count += 1
76-
content[i] = f'<span id="hunk{count}" style="visibility: hidden;"></span>' + content[i]
77-
break
78-
with open(file_path, 'w') as file:
79-
file.writelines(content)
74+
search_result = re.search(r'@@ -(\d+),(\d+) \+(\d+),(\d+)', line)
75+
if search_result:
76+
line_number = int(search_result.group(3))
77+
for i in range(line_number - 1, -1, -1):
78+
if content[i].startswith('<'):
79+
count += 1
80+
content[i] = f'<span id="hunk{count}" style="visibility: hidden;"></span>' + content[i]
81+
break
82+
if content:
83+
with open(file_path, 'w') as file:
84+
file.writelines(content)
85+
path = 'html/' + doc
8086
hunks = '&nbsp;'.join(f'<a href="{path}#hunk{i+1}" class="hunk" target="_blank">#{i + 1}</a>' for i in range(count))
8187
out_blocks.append(f'<p class="diff"><a href="{path}">{doc}</a>&nbsp;' + hunks + '&emsp;</p>'
8288
+ '\n<pre><code class="language-diff">'

.github/sync_labels.py

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ def __init__(self, url, actor):
141141
self._commits = None
142142
self._commit_date = None
143143
self._bot_login = None
144+
self._gh_version = None
144145

145146
s = url.split('/')
146147
self._owner = s[3]
@@ -235,13 +236,30 @@ def bot_login(self):
235236
"""
236237
if self._bot_login:
237238
return self._bot_login
238-
cmd = 'gh auth status'
239239
from subprocess import run
240+
cmd = 'gh version'
241+
capt = run(cmd, shell=True, capture_output=True)
242+
self._gh_version = str(capt.stdout).split('\\n')[0]
243+
info('version: %s' % self._gh_version)
244+
cmd = 'gh auth status'
240245
capt = run(cmd, shell=True, capture_output=True)
241-
l = str(capt.stderr).split()
242-
if not 'as' in l:
243-
l = str(capt.stdout).split()
244-
self._bot_login = l[l.index('as')+1]
246+
errtxt = str(capt.stderr)
247+
outtxt = str(capt.stdout)
248+
debug('auth status err: %s' % errtxt)
249+
debug('auth status out: %s' % outtxt)
250+
def read_login(txt, position_mark):
251+
for t in txt:
252+
for p in position_mark:
253+
# the output text has changed from as to account
254+
# around version 2.40.0
255+
l = t.split()
256+
if p in l:
257+
return l[l.index(p)+1]
258+
self._bot_login = read_login([errtxt, outtxt], ['account', 'as'])
259+
if not self._bot_login:
260+
self._bot_login = default_bot
261+
warning('Bot is unknown')
262+
return self._bot_login
245263
if self._bot_login.endswith('[bot]'):
246264
self._bot_login = self._bot_login.split('[bot]')[0]
247265
info('Bot is %s' % self._bot_login)
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"sage_setup.clean": {
3+
"failed": true
4+
},
5+
"sage.combinat.cluster_algebra_quiver.quiver": {
6+
"failed": true
7+
},
8+
"sage.geometry.cone": {
9+
"failed": true
10+
},
11+
"sage.groups.matrix_gps.finitely_generated_gap": {
12+
"failed": true
13+
},
14+
"sage.interfaces.expect": {
15+
"failed": true
16+
},
17+
"sage.libs.gap.element": {
18+
"failed": true
19+
},
20+
"sage.libs.singular.singular": {
21+
"failed": true
22+
},
23+
"sage.matrix.matrix2": {
24+
"failed": true
25+
},
26+
"sage.matrix.matrix_integer_sparse": {
27+
"failed": true
28+
},
29+
"sage.misc.lazy_import": {
30+
"failed": true
31+
},
32+
"sage.misc.weak_dict": {
33+
"failed": true
34+
},
35+
"sage.modular.modform.l_series_gross_zagier": {
36+
"failed": true
37+
},
38+
"sage.rings.function_field.drinfeld_modules.morphism": {
39+
"failed": true
40+
},
41+
"sage.rings.polynomial.multi_polynomial_ideal": {
42+
"failed": true
43+
},
44+
"sage.rings.polynomial.multi_polynomial_libsingular": {
45+
"failed": true
46+
},
47+
"sage.rings.polynomial.skew_polynomial_finite_field": {
48+
"failed": true
49+
},
50+
"sage.tests.gap_packages": {
51+
"failed": true
52+
}
53+
}

.github/workflows/ci-conda.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
runs-on: ${{ matrix.os }}
2222

2323
strategy:
24-
fail-fast: ${{ github.event_name == 'pull_request' }}
25-
max-parallel: ${{ github.event_name == 'pull_request' && 2 || 6 }}
2624
matrix:
2725
os: [ubuntu-latest, macos-latest]
2826
python: ['3.9', '3.10', '3.11']
@@ -94,7 +92,7 @@ jobs:
9492
- name: Test
9593
if: success() || failure()
9694
shell: bash -l {0}
97-
run: ./sage -t --all -p0
95+
run: ./sage -t --all --baseline-stats-path=.github/workflows/ci-conda-known-test-failures.json -p0
9896

9997
- name: Print logs
10098
if: always()

.github/workflows/cygwin.yml

Lines changed: 0 additions & 151 deletions
This file was deleted.

.github/workflows/doc-build-pdf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
export PATH="build/bin:$PATH"
5858
eval $(sage-print-system-package-command auto update)
5959
eval $(sage-print-system-package-command auto --yes --no-install-recommends install zip)
60-
eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive)
60+
eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive texlive_luatex free_fonts xindy)
6161
6262
- name: Add prebuilt tree as a worktree
6363
id: worktree

.github/workflows/doc-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
export PATH="build/bin:$PATH"
162162
eval $(sage-print-system-package-command auto update)
163163
eval $(sage-print-system-package-command auto --yes --no-install-recommends install zip)
164-
eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive)
164+
eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git texlive texlive_luatex free_fonts xindy)
165165
export SAGE_USE_CDNS=yes
166166
export SAGE_LIVE_DOC=yes
167167
export SAGE_JUPYTER_SERVER=binder:sagemath/sage-binder-env/dev

.github/workflows/extract-sage-local.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ fi
88
# Show all tar files
99
ls -l $*
1010

11-
# Cygwin note: We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
1211
for a in $*; do
1312
echo Extracting $a
1413
(cd / && tar xf -) < $a
@@ -33,10 +32,3 @@ fi
3332

3433
# Show how we are doing on free space.
3534
df -h
36-
37-
# Rebase!
38-
case "$(uname)" in
39-
CYGWIN*)
40-
exec src/bin/sage-rebase.sh --all "$SAGE_LOCAL"
41-
;;
42-
esac

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.3.beta1
7+
version: 10.3.beta4
88
doi: 10.5281/zenodo.593563
9-
date-released: 2023-12-10
9+
date-released: 2023-12-26
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

0 commit comments

Comments
 (0)