Update devcontainer file

knelli2 · Sep 14, 2023 · e3c331e · e3c331e
1 parent 67f5bff
commit e3c331e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 31 deletions.
diff --git a/.devcontainer/cmake-kits.json b/.devcontainer/cmake-kits.json
@@ -2,15 +2,13 @@
     {
         "name": "Default",
         "compilers": {
-            "C": "/usr/bin/clang-10",
-            "CXX": "/usr/bin/clang++-10",
-            "Fortran": "/usr/bin/gfortran-9"
+            "C": "clang",
+            "CXX": "clang++",
+            "Fortran": "gfortran"
         },
         "cmakeSettings": {
             "BUILD_SHARED_LIBS": "ON",
-            "BUILD_PYTHON_BINDINGS": "ON",
-            "MEMORY_ALLOCATOR": "SYSTEM",
-            "Python_EXECUTABLE": "/usr/bin/python3"
+            "MEMORY_ALLOCATOR": "SYSTEM"
         },
         "preferredGenerator": {
             "name": "Unix Makefiles"

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,31 +3,36 @@
     "image": "sxscollaboration/spectre:dev",
     "workspaceMount": "source=${localWorkspaceFolder},target=${localWorkspaceFolder},type=bind,consistency=delegated",
     "workspaceFolder": "${localWorkspaceFolder}",
-    "extensions": [
-        "eamodio.gitlens",
-        "foxundermoon.shell-format",
-        "github.vscode-pull-request-github",
-        "gruntfuggly.format-modified",
-        "ms-python.python",
-        "ms-vscode.cmake-tools",
-        "ms-vscode.cpptools",
-        "ms-vsliveshare.vsliveshare",
-        "redhat.vscode-yaml",
-        "stkb.rewrap",
-        "streetsidesoftware.code-spell-checker",
-        "twxs.cmake"
-    ],
-    "settings": {
-        "cmake.buildDirectory": "${localWorkspaceFolder}/build-${buildKit}-${buildType}",
-        "editor.rulers": [
-            80
-        ],
-        "editor.wordWrap": "off",
-        "editor.formatOnSave": false,
-        "editor.formatOnPaste": true,
-        "editor.formatOnType": true,
-        "python.pythonPath": "/usr/bin/python3",
-        "python.formatting.provider": "black"
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "eamodio.gitlens",
+                "foxundermoon.shell-format",
+                "github.vscode-pull-request-github",
+                "gruntfuggly.format-modified",
+                "ms-python.black-formatter",
+                "ms-python.python",
+                "ms-vscode.cmake-tools",
+                "ms-vscode.cpptools",
+                "ms-vsliveshare.vsliveshare",
+                "redhat.vscode-yaml",
+                "stkb.rewrap",
+                "streetsidesoftware.code-spell-checker",
+                "twxs.cmake"
+            ],
+            "settings": {
+                "cmake.buildDirectory": "${localWorkspaceFolder}/build-${buildKit}-${buildType}",
+                "editor.rulers": [80],
+                "editor.wordWrap": "off",
+                "editor.formatOnSave": false,
+                "editor.formatOnPaste": true,
+                "editor.formatOnType": true,
+                "python.pythonPath": "/usr/bin/python3",
+                "[python]": {
+                    "editor.defaultFormatter": "ms-python.black-formatter"
+                }
+            }
+        }
     },
     "remoteEnv": {
         "SPECTRE_HOME": "${localWorkspaceFolder}"