From 21211d8ce891c3b5eaf25cb3a396f88edc527a8e Mon Sep 17 00:00:00 2001 From: Kwankyu Lee Date: Tue, 8 Oct 2024 22:21:24 +0900 Subject: [PATCH] Add develop/devcontainer.json --- .devcontainer/develop-source/devcontainer.json | 14 ++++++++++++++ .vscode/settings.json | 7 ++----- build/bin/sage-print-system-package-command | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 .devcontainer/develop-source/devcontainer.json diff --git a/.devcontainer/develop-source/devcontainer.json b/.devcontainer/develop-source/devcontainer.json new file mode 100644 index 00000000000..b8b0074feca --- /dev/null +++ b/.devcontainer/develop-source/devcontainer.json @@ -0,0 +1,14 @@ +// Dev container for installing Sage from source +// See https://aka.ms/devcontainer.json for format details. +{ + "name": "Source", + "containerEnv": { + "MAKE": "make -j4", + "EXTRA_SYSTEM_PACKAGES": "python3.12" + }, + "onCreateCommand": ".devcontainer/onCreate.sh --sudo", + "extensions": [ + "ms-python.python", // Python extension for VS Code + "charliermarsh.ruff", // Ruff extension for VS Code + ], +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 86eac03ffe9..378fb4682cb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,16 +1,13 @@ +// This settings file is not ignored by git. It should be kept in sync with +// the Sage github repo. { - // This settings file is not ignored by git. It should be kept in sync with - // the trac repo. - "python.defaultInterpreterPath": "./venv/bin/python3", "files.exclude": { "**/__pycache__": true, "src/**/*.cpp": true, "src/**/*.so": true }, "search.exclude": { - // Exclude symbolic links into SAGE_ROOT/pkgs/ "build/pkgs/*/src": true, - // Exclude symbolic links into SAGE_ROOT/src/ "pkgs/sage-conf_conda/sage_root": true, "pkgs/sage-conf_pypi/sage_root": true, "pkgs/sage-docbuild/sage_docbuild": true, diff --git a/build/bin/sage-print-system-package-command b/build/bin/sage-print-system-package-command index daf61c48c09..0d0ccdd1cc9 100755 --- a/build/bin/sage-print-system-package-command +++ b/build/bin/sage-print-system-package-command @@ -172,6 +172,9 @@ case $system:$command in [ "$YES" = yes ] && options="$options --yes" [ -n "$system_packages" ] && print_shell_command conda install $options $system_packages ;; + homebrew*:update) + print_shell_command "brew update" + ;; homebrew*:install) [ -n "$system_packages" ] && print_shell_command brew install $system_packages ;;