diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e6a466b..1a0b246 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,22 @@ { + "name": "python_template", + "dockerComposeFile": [ + "docker-compose.yaml" + ], + "service": "app", + "workspaceFolder": "/workspace", + "features": { + "ghcr.io/devcontainers/features/common-utils:2": { + "installZsh": true + }, + "ghcr.io/devcontainers/features/git:1": {} + }, "customizations": { "vscode": { + "settings": { + "python.defaultInterpreterPath": "${containerWorkspaceFolder}/.venv/bin/python", + "terminal.integrated.defaultProfile.linux": "zsh" + }, "extensions": [ "ms-python.python", "charliermarsh.ruff", @@ -9,32 +25,16 @@ "mhutchie.git-graph", "Gruntfuggly.todo-tree", "esbenp.prettier-vscode" - ], - "settings": { - "python.defaultInterpreterPath": "${containerWorkspaceFolder}/.venv/bin/python", - "terminal.integrated.defaultProfile.linux": "zsh" - } + ] } }, - "dockerComposeFile": [ - "docker-compose.yaml" - ], - "features": { - "ghcr.io/devcontainers/features/common-utils:2": { - "installZsh": true - }, - "ghcr.io/devcontainers/features/git:1": {} - }, "forwardPorts": [ 8888 ], - "name": "python_template", - "postCreateCommand": "bash .devcontainer/postCreateCommand.sh", - "postStartCommand": "bash .devcontainer/postStartCommand.sh", + "remoteUser": "vscode", "remoteEnv": { "PATH": "${containerEnv:PATH}:/home/vscode/.local/bin" }, - "remoteUser": "vscode", - "service": "app", - "workspaceFolder": "/workspace" + "postCreateCommand": "bash .devcontainer/postCreateCommand.sh", + "postStartCommand": "bash .devcontainer/postStartCommand.sh" } diff --git a/.prettierrc.json b/.prettierrc.json index 41b14c7..1ffcf9a 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,18 +1,18 @@ { - "arrowParens": "always", - "bracketSpacing": true, - "embeddedLanguageFormatting": "auto", - "endOfLine": "lf", - "htmlWhitespaceSensitivity": "css", - "jsxBracketSameLine": false, - "jsxSingleQuote": false, "printWidth": 120, - "proseWrap": "preserve", - "quoteProps": "as-needed", + "tabWidth": 2, + "useTabs": false, "semi": true, "singleQuote": false, - "tabWidth": 2, + "quoteProps": "as-needed", + "jsxSingleQuote": false, "trailingComma": "es5", - "useTabs": false, - "vueIndentScriptAndStyle": false + "bracketSpacing": true, + "jsxBracketSameLine": false, + "arrowParens": "always", + "proseWrap": "preserve", + "htmlWhitespaceSensitivity": "css", + "vueIndentScriptAndStyle": false, + "endOfLine": "lf", + "embeddedLanguageFormatting": "auto" } diff --git a/.vscode/launch.json b/.vscode/launch.json index bdb53f2..c4f5d24 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,12 +1,12 @@ { + "version": "0.2.0", "configurations": [ { - "justMyCode": false, - "module": "python_template", "name": "Python: Module", + "type": "debugpy", "request": "launch", - "type": "debugpy" + "module": "python_template", + "justMyCode": false } - ], - "version": "0.2.0" + ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 90e8782..5063461 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,41 +1,41 @@ { "[python]": { + "editor.formatOnSave": true, + "editor.defaultFormatter": "charliermarsh.ruff", "editor.codeActionsOnSave": { "source.fixAll": "explicit", "source.organizeImports": "explicit" }, - "editor.defaultFormatter": "charliermarsh.ruff", - "editor.formatOnSave": true, "editor.rulers": [ 100 ], "files.trimTrailingWhitespace": true }, "[yaml]": { - "editor.autoIndent": "keep", - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, "editor.insertSpaces": true, - "editor.quickSuggestions": { - "comments": false, - "other": true, - "strings": true - }, + "editor.formatOnSave": true, + "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.tabSize": 2, + "editor.autoIndent": "keep", "gitlens.codeLens.scopes": [ "document" - ] + ], + "editor.quickSuggestions": { + "other": true, + "comments": false, + "strings": true + } }, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - "python.analysis.autoImportCompletions": true, - "python.analysis.typeCheckingMode": "basic", - "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python", + "python.testing.pytestEnabled": true, "python.testing.autoTestDiscoverOnSaveEnabled": true, "python.testing.pytestArgs": [ "tests" ], - "python.testing.pytestEnabled": true, + "ruff.enable": true, + "python.analysis.typeCheckingMode": "basic", + "python.analysis.autoImportCompletions": true, "python.testing.unittestEnabled": false, - "ruff.enable": true + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true, + "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python" }