Skip to content

Commit 6207fc5

Browse files
authored
Merge branch 'develop' into ramified_places
2 parents 74c1c4d + 15fcf52 commit 6207fc5

File tree

4,066 files changed

+27506
-16439
lines changed

Some content is hidden

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

4,066 files changed

+27506
-16439
lines changed

.ci/create-changes-html.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ echo '<script>hljs.highlightAll();</script>' >> CHANGES.html
1919
cat >> CHANGES.html << EOF
2020
<script>
2121
document.addEventListener('DOMContentLoaded', () => {
22+
const baseDocURL = 'https://sagemath.netlify.app'
2223
const diffSite = 'https://pianomister.github.io/diffsite'
23-
const baseDocURL = 'https://sagemath-tobias.netlify.app'
2424
const diffParagraphs = document.querySelectorAll('p.diff');
2525
diffParagraphs.forEach(paragraph => {
2626
const rootURL = window.location.origin;

.devcontainer/devcontainer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@
2222
"vscode": {
2323
"extensions": [
2424
"guyskk.language-cython",
25-
"ms-python.isort",
2625
"ms-toolsai.jupyter",
2726
"ms-python.vscode-pylance",
28-
"ms-python.pylint",
2927
"ms-python.python",
3028
"lextudio.restructuredtext",
31-
"trond-snekvik.simple-rst"
29+
"trond-snekvik.simple-rst",
30+
"charliermarsh.ruff"
3231
]
3332
}
3433
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "ubuntu-trusty-toolchain-gcc_9-minimal (≥ 8-core)",
6+
"name": "fedora-40-minimal (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "ubuntu-trusty-toolchain-gcc_9",
11+
"SYSTEM_FACTOR": "fedora-40",
1212
"PACKAGE_FACTOR": "minimal",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "ubuntu-trusty-toolchain-gcc_9-standard (≥ 8-core)",
6+
"name": "fedora-40-standard (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "ubuntu-trusty-toolchain-gcc_9",
11+
"SYSTEM_FACTOR": "fedora-40",
1212
"PACKAGE_FACTOR": "standard",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "opensuse-15.3-gcc_11-python3.9-minimal (≥ 8-core)",
6+
"name": "gentoo-python3.12-minimal (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "opensuse-15.3-gcc_11-python3.9",
11+
"SYSTEM_FACTOR": "gentoo-python3.12",
1212
"PACKAGE_FACTOR": "minimal",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// from .devcontainer/portability-devcontainer.json.in
44
// See https://aka.ms/devcontainer.json for format details.
55
{
6-
"name": "opensuse-15.3-gcc_11-python3.9-standard (≥ 8-core)",
6+
"name": "gentoo-python3.12-standard (≥ 8-core)",
77
"build": {
88
"dockerfile": "portability-Dockerfile",
99
// See tox.ini for definitions
1010
"args": {
11-
"SYSTEM_FACTOR": "opensuse-15.3-gcc_11-python3.9",
11+
"SYSTEM_FACTOR": "gentoo-python3.12",
1212
"PACKAGE_FACTOR": "standard",
1313
"DOCKER_TARGET": "with-targets",
1414
"DOCKER_TAG": "dev"

0 commit comments

Comments
 (0)