Merge pull request #35 from MBARIMike/main

Get VS Code launch.json items working
mbari-org · Aug 12, 2021 · 1548cce · 1548cce
2 parents 167aae3 + f657071
commit 1548cce
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -21,7 +21,7 @@
       "editor.rulers": [120]
     },
     "editor.formatOnSave": true,
-    "python.pythonPath": "/usr/local/bin/python",
+    "python.pythonPath": "/usr/bin/python",
     "python.linting.pylintEnabled": true,
     "python.formatting.provider": "black",
     "python.linting.flake8Enabled": true,

diff --git a/smdb/.vscode/launch.json → .vscode/launch.json b/smdb/.vscode/launch.json → .vscode/launch.json
@@ -8,24 +8,31 @@
       "name": "Django runserver_plus",
       "type": "python",
       "request": "launch",
-      "program": "${workspaceFolder}/manage.py",
-      "args": ["runserver_plus", "0.0.0.0:8000", "--settings", "config.settings.local"],
-      "django": true
+      "cwd": "${workspaceFolder}/smdb",
+      "program": "${workspaceFolder}/smdb/manage.py",
+      "args": [
+        "runserver_plus",
+        "0.0.0.0:8000",
+        "--settings",
+        "config.settings.local"
+      ],
+      "django": true,
+      "justMyCode": false
     },
     {
       "name": "manage.py shell_plus",
       "type": "python",
       "request": "launch",
-      "program": "${workspaceFolder}/manage.py",
+      "program": "${workspaceFolder}/smdb/manage.py",
       "console": "integratedTerminal",
       "args": ["shell_plus"],
       "justMyCode": false
-    }
+    },
     {
       "name": "load.py",
       "type": "python",
       "request": "launch",
-      "program": "${workspaceFolder}/scripts/load.py",
+      "program": "${workspaceFolder}/smdb/scripts/load.py",
       "console": "integratedTerminal",
       "args": ["-v 2", "--regex", "mbsystem/Data/2019/20191106m3/ZTopo.grd$"],
       "justMyCode": false

diff --git a/smdb/.vscode/settings.json → .vscode/settings.json b/smdb/.vscode/settings.json → .vscode/settings.json