Skip to content

Commit ad237b3

Browse files
author
Matthias Köppe
authored
Merge branch 'develop' into sd117_more_optional_doctest_tags
2 parents 7f37354 + 05329f6 commit ad237b3

File tree

530 files changed

+4794
-2542
lines changed

Some content is hidden

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

530 files changed

+4794
-2542
lines changed

.devcontainer/devcontainer.json

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/debian
3+
{
4+
"name": "Conda",
5+
"image": "mcr.microsoft.com/vscode/devcontainers/base:0-bullseye",
6+
7+
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
8+
"remoteUser": "vscode",
9+
10+
// Setup conda environment
11+
"onCreateCommand": ".devcontainer/onCreate-conda.sh",
12+
13+
// Install additional features.
14+
"features": {
15+
// For config options, see https://github.com/devcontainers/features/tree/main/src/conda
16+
"ghcr.io/devcontainers/features/conda": {
17+
"version": "latest",
18+
"addCondaForge": "true"
19+
}
20+
},
21+
"customizations": {
22+
"vscode": {
23+
"extensions": [
24+
"guyskk.language-cython",
25+
"ms-python.isort",
26+
"ms-toolsai.jupyter",
27+
"ms-python.vscode-pylance",
28+
"ms-python.pylint",
29+
"ms-python.python",
30+
"lextudio.restructuredtext",
31+
"trond-snekvik.simple-rst"
32+
]
33+
}
34+
}
35+
}

.devcontainer/onCreate-conda.sh

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Do not keep running on errors
2+
set -e
3+
4+
# Create conda environment
5+
./bootstrap-conda
6+
conda install mamba -n base -c conda-forge -y
7+
mamba env create --file src/environment-dev.yml || mamba env update --file src/environment-dev.yml
8+
conda init bash
9+
10+
# Build sage
11+
conda run -n sage-dev ./bootstrap
12+
conda run -n sage-dev ./configure --with-python=/opt/conda/envs/sage-dev/bin/python --prefix=/opt/conda/envs/sage-dev
13+
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
14+
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./src

.devcontainer/portability-updateContent.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# The script assumes that it is run from SAGE_ROOT.
66
#
77
# If "config.log" or "logs" are symlinks (for example, created by 'tox -e local-...',
8-
# or after https://trac.sagemath.org/ticket/33262), they might point outside of
8+
# or after https://github.com/sagemath/sage/issues/33262), they might point outside of
99
# the dev container, so remove them. Likewise for upstream.
1010
for f in config.log logs upstream; do
1111
if [ -L $f ]; then
1212
rm -f $f
1313
fi
1414
done
15-
# If possible (ensured after https://trac.sagemath.org/ticket/33262), keep the
15+
# If possible (ensured after https://github.com/sagemath/sage/issues/33262), keep the
1616
# logs in the container.
1717
if [ ! -d logs ]; then
1818
ln -s /sage/logs logs

0 commit comments

Comments
 (0)