Merge branch 'mealie-next' into manage-data-improve-delete-prompt

This commit is contained in:
boc-the-git 2023-11-25 07:49:31 +11:00 committed by GitHub
commit 9fd61308d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 32 deletions

View File

@ -18,31 +18,26 @@
"source=mealie-devcontainer-workspace,target=/workspaces/mealie/frontend/node_modules,type=volume", "source=mealie-devcontainer-workspace,target=/workspaces/mealie/frontend/node_modules,type=volume",
"source=mealie-bashhistory,target=/home/vscode/commandhistory,type=volume" "source=mealie-bashhistory,target=/home/vscode/commandhistory,type=volume"
], ],
// Set *default* container specific settings.json values on container create. "customizations": {
"settings": { "vscode": {
"python.defaultInterpreterPath": "/usr/local/bin/python", "settings": {
"python.linting.enabled": true, "python.defaultInterpreterPath": "/usr/local/bin/python",
"python.linting.pylintEnabled": true, "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
"python.formatting.blackPath": "/usr/local/py-utils/bin/black", "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf", },
"python.linting.banditPath": "/usr/local/py-utils/bin/bandit", "extensions": [
"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8", "dbaeumer.vscode-eslint",
"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy", "matangover.mypy",
"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle", "ms-python.black-formatter",
"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle", "ms-python.isort",
"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint" "ms-python.pylint",
"ms-python.python",
"ms-python.vscode-pylance",
"Vue.volar"
]
}
}, },
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"dbaeumer.vscode-eslint",
"matangover.mypy",
"ms-python.black-formatter",
"ms-python.isort",
"ms-python.python",
"ms-python.vscode-pylance",
"Vue.volar"
],
// Use 'forwardPorts' to make a list of ports inside the container available locally. // Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [ "forwardPorts": [
3000, 3000,

11
.vscode/settings.json vendored
View File

@ -36,13 +36,6 @@
"i18n-ally.localesPaths": "frontend/lang/messages", "i18n-ally.localesPaths": "frontend/lang/messages",
"i18n-ally.sourceLanguage": "en-US", "i18n-ally.sourceLanguage": "en-US",
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python", "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
"python.formatting.provider": "black",
"python.linting.enabled": true,
"python.linting.flake8Enabled": false,
"python.linting.pylintEnabled": false,
"python.linting.pylintArgs": [
"--rcfile=${workspaceFolder}/.pylintrc"
],
"python.testing.autoTestDiscoverOnSaveEnabled": false, "python.testing.autoTestDiscoverOnSaveEnabled": false,
"python.testing.pytestArgs": [ "python.testing.pytestArgs": [
"tests" "tests"
@ -50,7 +43,6 @@
"python.testing.pytestEnabled": true, "python.testing.pytestEnabled": true,
"python.testing.unittestEnabled": false, "python.testing.unittestEnabled": false,
"python.analysis.typeCheckingMode": "off", "python.analysis.typeCheckingMode": "off",
"python.linting.mypyEnabled": true,
"search.mode": "reuseEditor", "search.mode": "reuseEditor",
"python.testing.unittestArgs": [ "python.testing.unittestArgs": [
"-v", "-v",
@ -69,4 +61,7 @@
"[vue]": { "[vue]": {
"editor.formatOnSave": false "editor.formatOnSave": false
}, },
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter",
},
} }