Skip to content

Commit cf571d2

Browse files
tobiasdieztobiasdiez
authored
Merge branch 'develop' into meson-compile
2 parents a048c2a + c4363fc commit cf571d2

1,377 files changed

Lines changed: 21920 additions & 14819 deletions

File tree

Some content is hidden

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

‎.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/onCreate-conda.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@ conda init bash
88

99
# Build sage
1010
conda run -n sage-dev ./bootstrap
11-
conda run -n sage-dev ./configure --with-python=/opt/conda/envs/sage-dev/bin/python --prefix=/opt/conda/envs/sage-dev
12-
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
1311
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./src

.devcontainer/portability-ubuntu-trusty-toolchain-gcc_9-minimal/devcontainer.json renamed to .devcontainer/portability-fedora-40-minimal/devcontainer.json

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"

.devcontainer/portability-opensuse-15.3-gcc_11-python3.9-minimal/portability-Dockerfile renamed to .devcontainer/portability-fedora-40-minimal/portability-Dockerfile

File renamed without changes.

.devcontainer/portability-ubuntu-trusty-toolchain-gcc_9-standard/devcontainer.json renamed to .devcontainer/portability-fedora-40-standard/devcontainer.json

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"

.devcontainer/portability-opensuse-15.3-gcc_11-python3.9-standard/portability-Dockerfile renamed to .devcontainer/portability-fedora-40-standard/portability-Dockerfile

File renamed without changes.

.devcontainer/portability-opensuse-15.3-gcc_11-python3.9-minimal/devcontainer.json renamed to .devcontainer/portability-gentoo-python3.12-minimal/devcontainer.json

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"

.devcontainer/portability-opensuse-15.4-gcc_11-python3.10-minimal/portability-Dockerfile renamed to .devcontainer/portability-gentoo-python3.12-minimal/portability-Dockerfile

File renamed without changes.

.devcontainer/portability-opensuse-15.3-gcc_11-python3.9-standard/devcontainer.json renamed to .devcontainer/portability-gentoo-python3.12-standard/devcontainer.json

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"

.devcontainer/portability-opensuse-15.4-gcc_11-python3.10-standard/portability-Dockerfile renamed to .devcontainer/portability-gentoo-python3.12-standard/portability-Dockerfile

File renamed without changes.

0 commit comments

Comments
 (0)