Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge tag '9.8.beta0' into t/32601/modularization_of_sagelib__break_o…
Browse files Browse the repository at this point in the history
…ut_a_separate_package_sagemath_standard_no_symbolics

SageMath version 9.8.beta0, Release Date: 2022-09-25
  • Loading branch information
Matthias Koeppe committed Sep 26, 2022
2 parents bb844e6 + 4541564 commit d5f9cf5
Show file tree
Hide file tree
Showing 1,104 changed files with 38,054 additions and 11,562 deletions.
26 changes: 0 additions & 26 deletions .circleci/before-script.sh

This file was deleted.

89 changes: 0 additions & 89 deletions .circleci/config.yml

This file was deleted.

18 changes: 18 additions & 0 deletions .devcontainer/develop-docker-computop/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// See https://aka.ms/devcontainer.json for format details.
{
"name": "computop/sage Docker",
"image": "computop/sage",
"containerEnv": {
"MAKE": "make -j4"
},
// Install build tools, get rid of sourcing /sage/activate in non-login shells.
// libgmp.a is broken and leads to a build failure of ecm.
"onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc",
// Do not run configure within a sage-env (see #29485).
// The pari package is broken in the computop/sage 9.5 image, need to reinstall.
// Also libnauty is broken.
"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",
"extensions": [
"ms-python.python"
]
}
12 changes: 12 additions & 0 deletions .devcontainer/downstream-archlinux-latest/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// See https://aka.ms/devcontainer.json for format details.
{
"name": "archlinux:latest downstream Sage",
"image": "archlinux:latest",
// Create an empty bashrc to avoid the error "No such file or directory" when opening a terminal.
"onCreateCommand": "EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/onCreate.sh && touch ~/.bashrc",
// There's no SAGE_LOCAL, so remove the symlink 'prefix'.
"updateContentCommand": "rm -f prefix && ln -sf /usr venv",
"extensions": [
"ms-python.python"
]
}
19 changes: 19 additions & 0 deletions .devcontainer/downstream-conda-forge-latest/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// See https://aka.ms/devcontainer.json for format details.
{
"name": "condaforge/mambaforge:latest downstream Sage",
"image": "condaforge/mambaforge:latest",
// Install Sage from the conda-forge package.
"onCreateCommand": "mamba install --yes sage",
// * If the workspace directory looks like a copy of the Sage source tree (SAGE_ROOT):
// - it bootstraps and configures the Sage distribution,
// - thus, the script ``./sage`` and the symlinks ``prefix``, ``venv`` are set as expected,
// - the source tree is prepared for rebuilding Sage based from the source tree on
// top of the existing installation from the Docker image.
// - however, it does not start the build.
// * Otherwise, it does nothing. This is so that users can copy this devcontainer.json file as is
// into their projects.
"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",
"extensions": [
"ms-python.python"
]
}
19 changes: 19 additions & 0 deletions .devcontainer/downstream-docker-cocalc/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// See https://aka.ms/devcontainer.json for format details.
{
"name": "CoCalc Docker",
"image": "sagemathinc/cocalc",
"containerEnv": {
"MAKE": "make -j4"
},
// libgmp.a is broken and leads to a build failure of ecm.
"onCreateCommand": ".devcontainer/onCreate.sh && rm -f /usr/local/sage/local/lib/libgmp.a",
// * If the workspace directory looks like a copy of the Sage source tree (SAGE_ROOT):
// - it bootstraps the Sage distribution,
// - sets the symlink ``venv`` as expected,
// * Otherwise, it does nothing. This is so that users can copy this devcontainer.json file as is
// into their projects.
"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",
"extensions": [
"ms-python.python"
]
}
18 changes: 18 additions & 0 deletions .devcontainer/downstream-docker-computop/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// See https://aka.ms/devcontainer.json for format details.
{
"name": "computop/sage Docker",
"image": "computop/sage",
"containerEnv": {
"MAKE": "make -j4"
},
// Install build tools, get rid of sourcing /sage/activate in non-login shells.
// libgmp.a is broken and leads to a build failure of ecm.
"onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc",
// Do not run configure within a sage-env (see #29485).
// The pari package is broken in the computop/sage 9.5 image, need to reinstall.
// Also libnauty is broken.
"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)",
"extensions": [
"ms-python.python"
]
}
9 changes: 9 additions & 0 deletions .devcontainer/onCreate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#! /bin/sh
# Run this script from SAGE_ROOT. Invoke with "--sudo" if sudo is needed.
export PATH=$(pwd)/build/bin:$PATH
SYSTEM=$(sage-guess-package-system)
eval $(sage-print-system-package-command $SYSTEM "$@" update)
eval $(sage-print-system-package-command $SYSTEM --yes "$@" --spkg install _bootstrap _prereq python3 git $EXTRA_SAGE_PACKAGES)
if [ -n "$EXTRA_SYSTEM_PACKAGES" ]; then
eval $(sage-print-system-package-command $SYSTEM --yes "$@" install $EXTRA_SYSTEM_PACKAGES)
fi
8 changes: 8 additions & 0 deletions .devcontainer/portability-Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This Dockerfile is used by all portability-.../devcontainer.json files,
# which provide the actual values for the 4 arguments defined below, which
# feed into the FROM statement that determines the base Docker image.
ARG SYSTEM_FACTOR="ubuntu-jammy"
ARG PACKAGE_FACTOR="standard"
ARG DOCKER_TARGET="with-system-packages"
ARG DOCKER_TAG="dev"
FROM ghcr.io/sagemath/sage/sage-docker-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}
22 changes: 22 additions & 0 deletions .devcontainer/portability-ubuntu-jammy-standard/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// See https://aka.ms/devcontainer.json for format details.
{
"name": "Ubuntu jammy",
"build": {
"dockerfile": "portability-Dockerfile",
// See tox.ini for definitions
"args": {
"SYSTEM_FACTOR": "ubuntu-jammy",
"PACKAGE_FACTOR": "standard",
"DOCKER_TARGET": "with-targets",
"DOCKER_TAG": "dev"
}
},
"containerEnv": {
"MAKE": "make -j4"
},
"onCreateCommand": ".devcontainer/onCreate.sh",
"updateContentCommand": ".devcontainer/portability-updateContent.sh",
"extensions": [
"ms-python.python"
]
}
30 changes: 30 additions & 0 deletions .devcontainer/portability-updateContent.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#! /bin/sh
# The portability-.../devcontainer.json configurations run this script after
# the container is started.
#
# The script assumes that it is run from SAGE_ROOT.
#
# If "config.log" or "logs" are symlinks (for example, created by 'tox -e local-...',
# or after https://trac.sagemath.org/ticket/33262), they might point outside of
# the dev container, so remove them. Likewise for upstream.
for f in config.log logs upstream; do
if [ -L $f ]; then
rm -f $f
fi
done
# If possible (ensured after https://trac.sagemath.org/ticket/33262), keep the
# logs in the container.
if [ ! -d logs ]; then
ln -s /sage/logs logs
fi
# Bootstrap, configure, and build the Sage distribution, reusing the Sage
# installation from the prebuilt image.
set -e
set -x
make configure
if [ -x /sage/config.status ]; then
eval ./configure $(/sage/config.status --config) --enable-build-as-root --prefix=/sage/local --with-sage-venv
else
./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv
fi
make build V=0
Loading

0 comments on commit d5f9cf5

Please sign in to comment.