Skip to content

Commit 8aece91

Browse files
author
Matthias Koeppe
committed
Merge tag '9.8.beta6' into t/22067/gf-polyhedron
SageMath version 9.8.beta6, Release Date: 2022-12-21
2 parents a43c6be + 2114066 commit 8aece91

File tree

6,042 files changed

+474371
-174501
lines changed

Some content is hidden

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

6,042 files changed

+474371
-174501
lines changed

‎.circleci/before-script.sh

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

‎.circleci/config.yml

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

‎.devcontainer/develop-docker-computop/devcontainer.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "computop/sage Docker",
4+
"image": "computop/sage",
5+
"containerEnv": {
6+
"MAKE": "make -j4"
7+
},
8+
// Install build tools, get rid of sourcing /sage/activate in non-login shells.
9+
// libgmp.a is broken and leads to a build failure of ecm.
10+
"onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc",
11+
// Do not run configure within a sage-env (see #29485).
12+
// The pari package is broken in the computop/sage 9.5 image, need to reinstall.
13+
// Also libnauty is broken.
14+
"updateContentCommand": "make configure && (export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && unset CFLAGS LDFLAGS CXXFLAGS CPATH LIBRARY_PATH && ./configure --prefix=/sage/local --with-sage-venv) && make pari-clean nauty-clean build V=0",
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}

‎.devcontainer/downstream-archlinux-latest/devcontainer.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "archlinux:latest downstream Sage",
4+
"image": "archlinux:latest",
5+
// Create an empty bashrc to avoid the error "No such file or directory" when opening a terminal.
6+
"onCreateCommand": "EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/onCreate.sh && touch ~/.bashrc",
7+
// There's no SAGE_LOCAL, so remove the symlink 'prefix'.
8+
"updateContentCommand": "rm -f prefix && ln -sf /usr venv",
9+
"extensions": [
10+
"ms-python.python"
11+
]
12+
}

‎.devcontainer/downstream-conda-forge-latest/devcontainer.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "condaforge/mambaforge:latest downstream Sage",
4+
"image": "condaforge/mambaforge:latest",
5+
// Install Sage from the conda-forge package.
6+
"onCreateCommand": "mamba install --yes sage",
7+
// * If the workspace directory looks like a copy of the Sage source tree (SAGE_ROOT):
8+
// - it bootstraps and configures the Sage distribution,
9+
// - thus, the script ``./sage`` and the symlinks ``prefix``, ``venv`` are set as expected,
10+
// - the source tree is prepared for rebuilding Sage based from the source tree on
11+
// top of the existing installation from the Docker image.
12+
// - however, it does not start the build.
13+
// * Otherwise, it does nothing. This is so that users can copy this devcontainer.json file as is
14+
// into their projects.
15+
"updateContentCommand": "if [ -d pkgs/sagemath-standard ]; then make configure && ln -sf $CONDA_PREFIX venv; else echo 'Edit .devcontainer/devcontainer.json (updateContentCommand) to run project-specific startup commands'; fi",
16+
"extensions": [
17+
"ms-python.python"
18+
]
19+
}

‎.devcontainer/downstream-docker-cocalc/devcontainer.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "CoCalc Docker",
4+
"image": "sagemathinc/cocalc",
5+
"containerEnv": {
6+
"MAKE": "make -j4"
7+
},
8+
// libgmp.a is broken and leads to a build failure of ecm.
9+
"onCreateCommand": ".devcontainer/onCreate.sh && rm -f /usr/local/sage/local/lib/libgmp.a",
10+
// * If the workspace directory looks like a copy of the Sage source tree (SAGE_ROOT):
11+
// - it bootstraps the Sage distribution,
12+
// - sets the symlink ``venv`` as expected,
13+
// * Otherwise, it does nothing. This is so that users can copy this devcontainer.json file as is
14+
// into their projects.
15+
"updateContentCommand": "if [ -d pkgs/sagemath-standard ]; then make configure && ./configure --enable-build-as-root --prefix=/usr/local/sage/local --with-sage-venv; else echo 'Edit .devcontainer/devcontainer.json (updateContentCommand) to run project-specific startup commands'; fi",
16+
"extensions": [
17+
"ms-python.python"
18+
]
19+
}

‎.devcontainer/downstream-docker-computop/devcontainer.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "computop/sage Docker",
4+
"image": "computop/sage",
5+
"containerEnv": {
6+
"MAKE": "make -j4"
7+
},
8+
// Install build tools, get rid of sourcing /sage/activate in non-login shells.
9+
// libgmp.a is broken and leads to a build failure of ecm.
10+
"onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc",
11+
// Do not run configure within a sage-env (see #29485).
12+
// The pari package is broken in the computop/sage 9.5 image, need to reinstall.
13+
// Also libnauty is broken.
14+
"updateContentCommand": "make configure && (export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && unset CFLAGS LDFLAGS CXXFLAGS CPATH LIBRARY_PATH && ./configure --prefix=/sage/local --with-sage-venv)",
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}

‎.devcontainer/onCreate.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#! /bin/sh
2+
# Run this script from SAGE_ROOT. Invoke with "--sudo" if sudo is needed.
3+
export PATH=$(pwd)/build/bin:$PATH
4+
SYSTEM=$(sage-guess-package-system)
5+
eval $(sage-print-system-package-command $SYSTEM "$@" update)
6+
eval $(sage-print-system-package-command $SYSTEM --yes "$@" --spkg install _bootstrap _prereq python3 git $EXTRA_SAGE_PACKAGES)
7+
if [ -n "$EXTRA_SYSTEM_PACKAGES" ]; then
8+
eval $(sage-print-system-package-command $SYSTEM --yes "$@" install $EXTRA_SYSTEM_PACKAGES)
9+
fi

‎.devcontainer/portability-Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This Dockerfile is used by all portability-.../devcontainer.json files,
2+
# which provide the actual values for the 4 arguments defined below, which
3+
# feed into the FROM statement that determines the base Docker image.
4+
ARG SYSTEM_FACTOR="ubuntu-jammy"
5+
ARG PACKAGE_FACTOR="standard"
6+
ARG DOCKER_TARGET="with-system-packages"
7+
ARG DOCKER_TAG="dev"
8+
FROM ghcr.io/sagemath/sage/sage-docker-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}

‎.devcontainer/portability-ubuntu-jammy-standard/devcontainer.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "Ubuntu jammy",
4+
"build": {
5+
"dockerfile": "portability-Dockerfile",
6+
// See tox.ini for definitions
7+
"args": {
8+
"SYSTEM_FACTOR": "ubuntu-jammy",
9+
"PACKAGE_FACTOR": "standard",
10+
"DOCKER_TARGET": "with-targets",
11+
"DOCKER_TAG": "dev"
12+
}
13+
},
14+
"containerEnv": {
15+
"MAKE": "make -j4"
16+
},
17+
"onCreateCommand": ".devcontainer/onCreate.sh",
18+
"updateContentCommand": ".devcontainer/portability-updateContent.sh",
19+
"extensions": [
20+
"ms-python.python"
21+
]
22+
}

0 commit comments

Comments
 (0)