From 7935d5221af0c727245022304c41ad1a9688076f Mon Sep 17 00:00:00 2001 From: Hillary Mutisya Date: Wed, 3 Jan 2024 05:02:16 -0800 Subject: [PATCH 1/5] allow shared developer settings --- .gitignore | 3 ++- python/.vscode/launch.json | 16 ++++++++++++++++ python/.vscode/settings.json | 3 +++ python/.vscode/tasks.json | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 python/.vscode/launch.json create mode 100644 python/.vscode/settings.json create mode 100644 python/.vscode/tasks.json diff --git a/.gitignore b/.gitignore index c5424f78..47db4511 100644 --- a/.gitignore +++ b/.gitignore @@ -9,9 +9,10 @@ node_modules/ # Local development and debugging .scratch/ -.vscode **/.vscode/* **/tsconfig.debug.json !**/.vscode/launch.json +!**/.vscode/settings.json +!**/.vscode/tasks.json **/build.bat diff --git a/python/.vscode/launch.json b/python/.vscode/launch.json new file mode 100644 index 00000000..2b2502c6 --- /dev/null +++ b/python/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Python: Current File", + "type": "python", + "request": "launch", + "program": "${file}", + "console": "integratedTerminal", + "justMyCode": false + } + ] +} \ No newline at end of file diff --git a/python/.vscode/settings.json b/python/.vscode/settings.json new file mode 100644 index 00000000..36ba53b2 --- /dev/null +++ b/python/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.defaultInterpreterPath": "/workspaces/TypeChat/python/.hatch/typechat/bin/python3.12" +} \ No newline at end of file diff --git a/python/.vscode/tasks.json b/python/.vscode/tasks.json new file mode 100644 index 00000000..46ad827f --- /dev/null +++ b/python/.vscode/tasks.json @@ -0,0 +1,15 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "hatch", + "type": "shell", + "command": "hatch config set dirs.env.virtual .hatch; hatch config update; hatch shell", + "runOptions": { + "runOn": "folderOpen" + } + } + ] +} \ No newline at end of file From 68f2ea6f4c9d78f897968978067d6719cd25fb9e Mon Sep 17 00:00:00 2001 From: Hillary Mutisya Date: Thu, 4 Jan 2024 20:27:56 +0000 Subject: [PATCH 2/5] Set vscode properties in devcontainer.json --- .gitignore | 3 +-- python/.devcontainer/devcontainer.json | 16 ++++++++++++++-- python/.vscode/settings.json | 3 --- python/.vscode/tasks.json | 15 --------------- 4 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 python/.vscode/settings.json delete mode 100644 python/.vscode/tasks.json diff --git a/.gitignore b/.gitignore index 47db4511..c5424f78 100644 --- a/.gitignore +++ b/.gitignore @@ -9,10 +9,9 @@ node_modules/ # Local development and debugging .scratch/ +.vscode **/.vscode/* **/tsconfig.debug.json !**/.vscode/launch.json -!**/.vscode/settings.json -!**/.vscode/tasks.json **/build.bat diff --git a/python/.devcontainer/devcontainer.json b/python/.devcontainer/devcontainer.json index 27636446..042f109e 100644 --- a/python/.devcontainer/devcontainer.json +++ b/python/.devcontainer/devcontainer.json @@ -13,8 +13,20 @@ "forwardPorts": [7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870], - // Configure tool-specific properties. - // "customizations": {}, + // Configure tool-specific properties. + "customizations": { + "vscode": { + "extensions": [ + "ms-python.python", + "ms-python.vscode-pylance" + ], + "settings": { + "python.defaultInterpreterPath": "/workspaces/TypeChat/python/.hatch/typechat/bin/python3.12" + } + } + }, + + "postCreateCommand": "hatch config set dirs.env.virtual .hatch; hatch config update;hatch env create" // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. // "remoteUser": "root" diff --git a/python/.vscode/settings.json b/python/.vscode/settings.json deleted file mode 100644 index 36ba53b2..00000000 --- a/python/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.defaultInterpreterPath": "/workspaces/TypeChat/python/.hatch/typechat/bin/python3.12" -} \ No newline at end of file diff --git a/python/.vscode/tasks.json b/python/.vscode/tasks.json deleted file mode 100644 index 46ad827f..00000000 --- a/python/.vscode/tasks.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "hatch", - "type": "shell", - "command": "hatch config set dirs.env.virtual .hatch; hatch config update; hatch shell", - "runOptions": { - "runOn": "folderOpen" - } - } - ] -} \ No newline at end of file From c34d10ee2d4c9cefb271a1afa6fa2d9672809576 Mon Sep 17 00:00:00 2001 From: Hillary Mutisya <150286414+hillary-mutisya@users.noreply.github.com> Date: Thu, 4 Jan 2024 14:53:55 -0800 Subject: [PATCH 3/5] Delete python/.vscode/launch.json --- python/.vscode/launch.json | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 python/.vscode/launch.json diff --git a/python/.vscode/launch.json b/python/.vscode/launch.json deleted file mode 100644 index 2b2502c6..00000000 --- a/python/.vscode/launch.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "Python: Current File", - "type": "python", - "request": "launch", - "program": "${file}", - "console": "integratedTerminal", - "justMyCode": false - } - ] -} \ No newline at end of file From 22554e54a29f1b7b4032f53338bd0d3bb1da83bb Mon Sep 17 00:00:00 2001 From: Hillary Mutisya <150286414+hillary-mutisya@users.noreply.github.com> Date: Thu, 4 Jan 2024 14:58:53 -0800 Subject: [PATCH 4/5] Update devcontainer.json --- python/.devcontainer/devcontainer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/python/.devcontainer/devcontainer.json b/python/.devcontainer/devcontainer.json index 042f109e..2e1f5d90 100644 --- a/python/.devcontainer/devcontainer.json +++ b/python/.devcontainer/devcontainer.json @@ -15,16 +15,16 @@ // Configure tool-specific properties. "customizations": { - "vscode": { + "vscode": { "extensions": [ - "ms-python.python", - "ms-python.vscode-pylance" - ], + "ms-python.python", + "ms-python.vscode-pylance" + ], "settings": { "python.defaultInterpreterPath": "/workspaces/TypeChat/python/.hatch/typechat/bin/python3.12" - } - } - }, + } + } + }, "postCreateCommand": "hatch config set dirs.env.virtual .hatch; hatch config update;hatch env create" From c6b61b09b5a437a749b89c3d29797dc6284c8d57 Mon Sep 17 00:00:00 2001 From: Hillary Mutisya <150286414+hillary-mutisya@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:01:19 -0800 Subject: [PATCH 5/5] Update devcontainer.json --- python/.devcontainer/devcontainer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/python/.devcontainer/devcontainer.json b/python/.devcontainer/devcontainer.json index 2e1f5d90..8c4d6b5f 100644 --- a/python/.devcontainer/devcontainer.json +++ b/python/.devcontainer/devcontainer.json @@ -15,15 +15,15 @@ // Configure tool-specific properties. "customizations": { - "vscode": { - "extensions": [ - "ms-python.python", - "ms-python.vscode-pylance" - ], - "settings": { - "python.defaultInterpreterPath": "/workspaces/TypeChat/python/.hatch/typechat/bin/python3.12" - } - } + "vscode": { + "extensions": [ + "ms-python.python", + "ms-python.vscode-pylance" + ], + "settings": { + "python.defaultInterpreterPath": "/workspaces/TypeChat/python/.hatch/typechat/bin/python3.12" + } + } }, "postCreateCommand": "hatch config set dirs.env.virtual .hatch; hatch config update;hatch env create"