Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into is_SchemeTopolog…
Browse files Browse the repository at this point in the history 
…icalPoint
  • Loading branch information
Matthias Koeppe committed Aug 3, 2024
2 parents c876dcf + 0f34773 commit de805b1
Show file tree
Hide file tree
Showing 2,568 changed files with 53,253 additions and 71,296 deletions.
45 changes: 29 additions & 16 deletions .ci/create-changes-html.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,27 @@ const diffSite = 'https://pianomister.github.io/diffsite'
const diffParagraphs = document.querySelectorAll('p.diff');
diffParagraphs.forEach(paragraph => {
const rootURL = window.location.origin;
const docAnchor = paragraph.querySelector('a'); // first "a" element
const docAnchor = paragraph.querySelector('a');
const url = new URL(docAnchor.href);
const path = url.pathname;
const anchor = document.createElement('a');
anchor.href = diffSite + '/?url1=' + rootURL + path + '&url2=' + baseDocURL + path;
anchor.textContent = 'compare with the base';
anchor.setAttribute('target', '_blank');
paragraph.innerHTML += '  ';
paragraph.appendChild(anchor);
paragraph.innerHTML += ' ';
const hunkAnchors = paragraph.querySelectorAll('a.hunk');
hunkAnchors.forEach(hunkAnchor => {
const hunks = paragraph.parentNode.querySelectorAll('p.hunk');
hunks.forEach(hunk => {
const hunkAnchor = hunk.querySelector('a');
const url = new URL(hunkAnchor.href);
const path = url.pathname;
const pathHash = path + url.hash.replace('#', '%23');
const anchor = document.createElement('a');
anchor.href = diffSite + '/?url1=' + rootURL + pathHash + '&url2=' + baseDocURL + path;
anchor.textContent = hunkAnchor.textContent;
anchor.textContent = 'compare with the base';
anchor.setAttribute('target', '_blank');
paragraph.appendChild(anchor);
paragraph.innerHTML += ' ';
hunk.innerHTML += '  ';
hunk.appendChild(anchor);
});
});
});
Expand All @@ -54,39 +55,51 @@ echo '<body>' >> CHANGES.html
(cd $DOC_REPOSITORY && git diff $BASE_DOC_COMMIT -- "*.html") > diff.txt
python3 - << EOF
import os, re, html
from itertools import chain
with open('diff.txt', 'r') as f:
diff_text = f.read()
diff_blocks = re.split(r'^(?=diff --git)', diff_text, flags=re.MULTILINE)
out_blocks = []
for block in diff_blocks:
match = re.search(r'^diff --git a/(.*) b/\1', block, flags=re.MULTILINE)
if match:
doc = match.group(1)
file_path = os.path.join('$DOC_REPOSITORY', doc)
path = match.group(1)
file_path = os.path.join('$DOC_REPOSITORY', path)
try:
with open(file_path, 'r') as file:
content = file.readlines()
except FileNotFoundError:
content = []
count = 0
hunks = []
hunk_lines = []
in_hunk = False
for line in block.splitlines():
if line.startswith('@@ -'):
if hunk_lines:
hunks.append('<pre><code class="language-diff">'
+ html.escape('\n'.join(hunk_lines)).strip()
+ '</code></pre>')
hunk_lines = []
search_result = re.search(r'@@ -(\d+),(\d+) \+(\d+),(\d+)', line)
if search_result:
line_number = int(search_result.group(3))
for i in range(line_number - 1, -1, -1):
if content[i].startswith('<'):
span = int(search_result.group(4))
for i in chain(range(line_number, line_number + span), range(line_number - 1, -1, -1)):
if content[i].startswith('<') and not content[i].startswith('</'):
count += 1
content[i] = f'<span id="hunk{count}" style="visibility: hidden;"></span>' + content[i]
hunks.append(f'<p class="hunk"><a href="{path}#hunk{count}" class="hunk" target="_blank">hunk #{count}</a></p>')
break
hunk_lines.append(line)
if hunk_lines:
hunks.append('<pre><code class="language-diff">'
+ html.escape('\n'.join(hunk_lines)).strip()
+ '</code></pre>')
if content:
with open(file_path, 'w') as file:
file.writelines(content)
path = doc
hunks = '&nbsp;'.join(f'<a href="{path}#hunk{i+1}" class="hunk" target="_blank">#{i + 1}</a>' for i in range(count))
out_blocks.append(f'<p class="diff"><a href="{path}">{doc}</a>&nbsp;' + hunks + '&emsp;</p>'
+ '\n<pre><code class="language-diff">'
+ html.escape(block).strip() + '</code></pre>')
out_blocks.append(f'<div class="diff"><p class="diff"><a href="{path}">{path}</a></p>\n' + '\n'.join(hunks) + '\n</div>')
output_text = '\n'.join(out_blocks)
with open('diff.html', 'w') as f:
f.write(output_text)
Expand Down
2 changes: 1 addition & 1 deletion .ci/write-dockerfile.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ RUN cd /new && rm -rf .git && \
mv src /sage/src; \
cd /sage && ./bootstrap && ./config.status; \
fi; \
cd /sage && rm -rf /new .git
cd /sage && rm -rf .git; rm -rf /new || echo "(error ignored)"
ARG TARGETS="build"
$RUN $CHECK_STATUS_THEN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS} $ENDRUN $THEN_SAVE_STATUS
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-linux-incremental.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ jobs:
# with only a small number of test failures as of 10.2.rc0
tox_system_factors: >-
["gentoo-python3.11",
"archlinux-latest"]
"archlinux-latest",
"fedora-40"]
tox_packages_factors: >-
["standard-sitepackages"]
docker_push_repository: ghcr.io/${{ github.repository }}/
3 changes: 1 addition & 2 deletions .github/workflows/ci-linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ jobs:
"debian-sid",
"linuxmint-21.1",
"linuxmint-21.2",
"fedora-38",
"fedora-39",
"fedora-40",
"centos-stream-9-python3.9",
"almalinux-8-python3.9",
"gentoo-python3.10",
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/doc-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ jobs:
find . -name "*.html" | xargs sed -i -e '/class="sidebar-brand-text"/ s/Sage [0-9a-z.]* /Sage '"$new_version"' /' \
-e '/<link rel="stylesheet"/ s/?v=[0-9a-f]*"/"/' \
-e 's;'"$mathjax_path_from"';'"$mathjax_path_to"';' \
-e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d')
-e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d' \
-e 's;#L[0-9]*";";' \
&& true)
# Create git repo from old doc
(cd doc && \
git init && \
Expand Down Expand Up @@ -199,6 +201,7 @@ jobs:
find . -name "*.html" | xargs sed -i -e '/This is documentation/ s/ built with GitHub PR .* for development/ for development/' \
-e '/<link rel="stylesheet"/ s/?v=[0-9a-f]*"/"/' \
-e '\;<script type="application/vnd\.jupyter\.widget-state+json">;,\;</script>; d' \
-e 's;#L[0-9]*";";' \
&& git commit -a -m 'wipe-out')
# Since HEAD is at commit 'wipe-out', HEAD~1 is commit 'new' (new doc), HEAD~2 is commit 'old' (old doc)
.ci/create-changes-html.sh $(cd doc && git rev-parse HEAD~2) doc
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ title: SageMath
abstract: SageMath is a free open-source mathematics software system.
authors:
- name: "The SageMath Developers"
version: 10.5.beta0
version: 10.5.beta1
doi: 10.5281/zenodo.8042260
date-released: 2024-07-24
date-released: 2024-08-03
repository-code: "https://github.com/sagemath/sage"
url: "https://www.sagemath.org/"
2 changes: 1 addition & 1 deletion VERSION.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 10.5.beta0, Release Date: 2024-07-24
SageMath version 10.5.beta1, Release Date: 2024-08-03
1 change: 1 addition & 0 deletions build/pkgs/4ti2/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
4ti2
4ti2-devel
2 changes: 1 addition & 1 deletion build/pkgs/_python3.9/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
python3.9
python3.9-devel
# Except on centos-stream-8 and almalinux-8, where it is called python39 and python39-devel; we special-case this in tox.ini
# python3.9 does not exist any more
2 changes: 1 addition & 1 deletion build/pkgs/beautifulsoup4/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-beautifulsoup4
python3-beautifulsoup4
1 change: 1 addition & 0 deletions build/pkgs/beniget/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-beniget
1 change: 1 addition & 0 deletions build/pkgs/biopython/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-biopython
2 changes: 1 addition & 1 deletion build/pkgs/bleach/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-bleach
python3-bleach
1 change: 1 addition & 0 deletions build/pkgs/ccache/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ccache
1 change: 1 addition & 0 deletions build/pkgs/cddlib/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
cddlib
cddlib-devel
2 changes: 1 addition & 1 deletion build/pkgs/certifi/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-certifi
python3-certifi
1 change: 1 addition & 0 deletions build/pkgs/cffi/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-cffi
1 change: 1 addition & 0 deletions build/pkgs/charset_normalizer/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-charset-normalizer
2 changes: 2 additions & 0 deletions build/pkgs/cocoalib/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
cocoalib
cocoalib-devel
1 change: 1 addition & 0 deletions build/pkgs/comm/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-comm
4 changes: 2 additions & 2 deletions build/pkgs/configure/checksums.ini
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tarball=configure-VERSION.tar.gz
sha1=442147504b01035e9cc36d5a726c454fbebd05ba
sha256=ebd714e56d0435cfd0e8faf94d3e9fc27c91a3d7dfeb42efb5b796fda1567a64
sha1=259cd70efeb5bfc37ab38d67a9d84e8fc368e603
sha256=fe3d338452726766f95ba9df3325d8cd03548c0e45d2c909006b395ad31b8326
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
238f042e65932c80a81e6841c10e6abcf8ed6e4f
79b13118ab80f055d3054745134cd02bb2660127
1 change: 1 addition & 0 deletions build/pkgs/contourpy/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-contourpy
1 change: 1 addition & 0 deletions build/pkgs/cppy/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-cppy
3 changes: 3 additions & 0 deletions build/pkgs/csdp/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
csdp
csdp-devel
csdp-tools
2 changes: 1 addition & 1 deletion build/pkgs/cvxopt/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-cvxopt
python3-cvxopt
2 changes: 1 addition & 1 deletion build/pkgs/cycler/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-cycler
python3-cycler
2 changes: 1 addition & 1 deletion build/pkgs/cython/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Cython
python3-cython
2 changes: 1 addition & 1 deletion build/pkgs/dateutil/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-dateutil
python3-dateutil
2 changes: 1 addition & 1 deletion build/pkgs/decorator/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-decorator
python3-decorator
1 change: 1 addition & 0 deletions build/pkgs/defusedxml/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-defusedxml
1 change: 1 addition & 0 deletions build/pkgs/docutils/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-docutils
1 change: 1 addition & 0 deletions build/pkgs/dot2tex/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dot2tex
1 change: 1 addition & 0 deletions build/pkgs/editables/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-editables
1 change: 1 addition & 0 deletions build/pkgs/entrypoints/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-entrypoints
4 changes: 2 additions & 2 deletions build/pkgs/exceptiongroup/checksums.ini
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=exceptiongroup-VERSION-py3-none-any.whl
sha1=4114f66482c6e55856d9bd6a4780ce716bd550cd
sha256=5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad
sha1=fd04443cb88d35ee59387ba20f62761ea5546a7d
sha256=3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b
upstream_url=https://pypi.io/packages/py3/e/exceptiongroup/exceptiongroup-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/exceptiongroup/package-version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.1
1.2.2
16 changes: 16 additions & 0 deletions build/pkgs/execnet/SPKG.rst
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
execnet: Rapid multi-Python deployment
======================================

Description
-----------

Rapid multi-Python deployment

License
-------

Upstream Contact
----------------

https://pypi.org/project/execnet/

4 changes: 4 additions & 0 deletions build/pkgs/execnet/checksums.ini
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
tarball=execnet-VERSION-py3-none-any.whl
sha1=3a3b88b478a03a9c9933a7bdaea3224a118cc121
sha256=26dee51f1b80cebd6d0ca8e74dd8745419761d3bef34163928cbebbdc4749fdc
upstream_url=https://pypi.io/packages/py3/e/execnet/execnet-VERSION-py3-none-any.whl
4 changes: 4 additions & 0 deletions build/pkgs/execnet/dependencies
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
| pip $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/execnet/package-version.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.1.1
1 change: 1 addition & 0 deletions build/pkgs/execnet/type
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
standard
1 change: 1 addition & 0 deletions build/pkgs/execnet/version_requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
execnet
1 change: 1 addition & 0 deletions build/pkgs/executing/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-executing
2 changes: 1 addition & 1 deletion build/pkgs/fastjsonschema/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-fastjsonschema
python3-fastjsonschema
2 changes: 2 additions & 0 deletions build/pkgs/ffmpeg/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# ffmpeg is not in the standard Fedora repository
# Need "RPM Fusion Free"
#ffmpeg
ffmpeg-free
ffmpeg-free-devel
1 change: 1 addition & 0 deletions build/pkgs/flit_core/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-flit-core
1 change: 1 addition & 0 deletions build/pkgs/fonttools/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-fonttools
2 changes: 1 addition & 1 deletion build/pkgs/fpylll/dependencies
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cython cysignals numpy fplll | $(PYTHON)
cython cysignals numpy fplll | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/free_fonts/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
gnu-free-mono-fonts
gnu-free-sans-fonts
gnu-free-serif-fonts
texlive-gnu-freefont
3 changes: 3 additions & 0 deletions build/pkgs/frobby/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
frobby
libfrobby
libfrobby-devel
4 changes: 2 additions & 2 deletions build/pkgs/furo/checksums.ini
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=furo-VERSION-py3-none-any.whl
sha1=f43dad408126f23ec5c480ad993e42335ca47713
sha256=490a00d08c0a37ecc90de03ae9227e8eb5d6f7f750edf9807f398a2bdf2358de
sha1=de4aa7aff48696580d62abed717bf1c309af10f5
sha256=b192c7c1f59805494c8ed606d9375fdac6e6ba8178e747e72bc116745fb7e13f
upstream_url=https://pypi.io/packages/py3/f/furo/furo-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/furo/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-furo
python3-furo
2 changes: 1 addition & 1 deletion build/pkgs/furo/package-version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.5.6
2024.7.18
67 changes: 67 additions & 0 deletions build/pkgs/gap/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,72 @@
# some packages are missing in Fedora
gap
gap-core
gap-devel
gap-libs
libgap
xgap
gap-pkg-ace
gap-pkg-aclib
gap-pkg-alnuth
gap-pkg-anupq
gap-pkg-atlasrep
gap-pkg-autodoc
gap-pkg-automata
gap-pkg-autpgrp
gap-pkg-browse
gap-pkg-caratinterface
gap-pkg-circle
gap-pkg-congruence
gap-pkg-crisp
gap-pkg-crypting
gap-pkg-crystcat
gap-pkg-curlinterface
gap-pkg-cvec
gap-pkg-datastructures
gap-pkg-digraphs
gap-pkg-edim
gap-pkg-ferret
gap-pkg-fga
gap-pkg-fining
gap-pkg-float
gap-pkg-format
gap-pkg-forms
gap-pkg-fplsa
gap-pkg-fr
gap-pkg-francy
gap-pkg-genss
gap-pkg-groupoids
gap-pkg-grpconst
gap-pkg-images
gap-pkg-io
gap-pkg-irredsol
gap-pkg-json
gap-pkg-jupyterviz
gap-pkg-lpres
gap-pkg-nq
gap-pkg-openmath
gap-pkg-orb
gap-pkg-permut
gap-pkg-polenta
gap-pkg-polycyclic
gap-pkg-primgrp
gap-pkg-profiling
gap-pkg-radiroot
gap-pkg-recog
gap-pkg-resclasses
gap-pkg-scscp
gap-pkg-semigroups
gap-pkg-singular
gap-pkg-smallgrp
gap-pkg-smallsemi
gap-pkg-sophus
gap-pkg-spinsym
gap-pkg-standardff
gap-pkg-tomlib
gap-pkg-transgrp
gap-pkg-transgrp-data
gap-pkg-utils
gap-pkg-uuid
gap-pkg-xmod
gap-pkg-zeromqinterface

1 change: 1 addition & 0 deletions build/pkgs/gap_jupyter/distros/fedora.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gap-pkg-jupyterkernel
Loading

0 comments on commit de805b1

Please sign in to comment.