From 604bc32feefc2f97a185a279cb4ad217de722856 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 14 Jun 2023 21:54:26 -0700 Subject: [PATCH 01/23] Add VS Code config --- .gitignore | 2 +- .vscode/extensions.json | 15 ++++++++++++++ .vscode/settings.json | 46 +++++++++++++++++++++++++++++++++++++++++ pyproject.toml | 4 ++++ requirements.txt | 9 -------- 5 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json delete mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore index 20c041e11..9e7335eec 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,7 @@ pip-wheel-metadata # --- IDE --- .idea -.vscode +.vscode/*/ # --- JS --- node_modules diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..d77ffd66e --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,15 @@ +{ + "recommendations": [ + "eamodio.gitlens", + "github.vscode-pull-request-github", + "wholroyd.jinja", + "esbenp.prettier-vscode", + "ms-python.vscode-pylance", + "ms-python.python", + "mrmlnc.vscode-autoprefixer", + "gruntfuggly.todo-tree", + "sourcery.sourcery", + "njpwerner.autodocstring", + "github.copilot" + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..c1b8370a1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,46 @@ +{ + "editor.detectIndentation": false, + "editor.formatOnSave": true, + "python.linting.enabled": true, + "python.linting.flake8Enabled": true, + "python.linting.pylintEnabled": true, + "python.linting.mypyEnabled": true, + "python.analysis.typeCheckingMode": "off", + "python.languageServer": "Pylance", + "python.formatting.provider": "black", + "isort.args": [ + "--src=${workspaceFolder}" + ], + "terminal.integrated.scrollback": 10000, + "git.autofetch": true, + "prettier.tabWidth": 4, + "prettier.useTabs": true, + "prettier.endOfLine": "auto", + "prettier.proseWrap": "never", + "autoprefixer.formatOnSave": true, + "files.associations": { + "**/requirements/*.txt": "pip-requirements", + "*.py-tpl": "python", + "**/templates/**.html": "jinja", + "**/template/**.html": "jinja", + }, + "[jsonc]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, + "[json]": { + "editor.defaultFormatter": "vscode.json-language-features" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[python]": { + "editor.defaultFormatter": "ms-python.python", + "editor.codeActionsOnSave": { + "source.organizeImports": true + } + }, + "files.insertFinalNewline": true +} diff --git a/pyproject.toml b/pyproject.toml index a4899a495..80f4d232d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -132,3 +132,7 @@ ban-relative-imports = "all" # Allow print "T201", ] + +[tool.isort] +profile = 'black' +skip = 'migrations' diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index dab76855e..000000000 --- a/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ --r requirements/build-docs.txt --r requirements/build-pkg.txt --r requirements/check-style.txt --r requirements/check-types.txt --r requirements/make-release.txt --r requirements/pkg-deps.txt --r requirements/pkg-extras.txt --r requirements/test-env.txt --r requirements/nox-deps.txt From 191915880cf16e7f8bcba70f6a71bd5c5e169f7a Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 14 Jun 2023 22:00:28 -0700 Subject: [PATCH 02/23] Change pull request template --- .github/pull_request_template.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d889c598a..a01c02274 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,14 +1,14 @@ -*By submitting this pull request you agree that all contributions to this project are made under the MIT license.* - -## Issues - - + ## Summary +## Issues + + + ## Checklist -- [ ] Tests have been included for all bug fixes or added functionality. -- [ ] The `changelog.rst` has been updated with any significant changes. +- [ ] Tests have been included for all bug fixes or added functionality. +- [ ] The `changelog.rst` has been updated with any significant changes. From e2feeb324cf29f530a33d04abef6bbb250f3a315 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 14 Jun 2023 22:19:10 -0700 Subject: [PATCH 03/23] remove isort --- .vscode/settings.json | 3 --- pyproject.toml | 4 ---- 2 files changed, 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c1b8370a1..9bd0d3a66 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,9 +8,6 @@ "python.analysis.typeCheckingMode": "off", "python.languageServer": "Pylance", "python.formatting.provider": "black", - "isort.args": [ - "--src=${workspaceFolder}" - ], "terminal.integrated.scrollback": 10000, "git.autofetch": true, "prettier.tabWidth": 4, diff --git a/pyproject.toml b/pyproject.toml index 80f4d232d..a4899a495 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -132,7 +132,3 @@ ban-relative-imports = "all" # Allow print "T201", ] - -[tool.isort] -profile = 'black' -skip = 'migrations' From 1ce169dadebf97a7e6fc4f9d6c07d9646e729d5e Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 14 Jun 2023 22:21:31 -0700 Subject: [PATCH 04/23] add ruff --- .vscode/extensions.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d77ffd66e..ea7a72157 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -10,6 +10,7 @@ "gruntfuggly.todo-tree", "sourcery.sourcery", "njpwerner.autodocstring", - "github.copilot" + "github.copilot", + "charliermarsh.ruff" ] } From 3bd8b6910376280253544eff6269230d38db4558 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 14 Jun 2023 22:37:18 -0700 Subject: [PATCH 05/23] subtext --- .github/pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a01c02274..d0bf4225f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,3 @@ - - ## Summary @@ -12,3 +10,5 @@ - [ ] Tests have been included for all bug fixes or added functionality. - [ ] The `changelog.rst` has been updated with any significant changes. + +This contribution conforms the project's open source license. From 36bc76c393e98c51fd5f87ea884ae4a37d8394df Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 14 Jun 2023 22:38:05 -0700 Subject: [PATCH 06/23] update PR comments --- .github/pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d0bf4225f..91824b559 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,10 +1,10 @@ ## Summary - + ## Issues - + ## Checklist From f9cb181b52d8b33df947bbfa071b7aecf5c2eb8f Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 14 Jun 2023 23:24:45 -0700 Subject: [PATCH 07/23] remove github projects link --- docs/source/about/changelog.rst | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/docs/source/about/changelog.rst b/docs/source/about/changelog.rst index 62e7d47eb..61fcd8f7d 100644 --- a/docs/source/about/changelog.rst +++ b/docs/source/about/changelog.rst @@ -3,15 +3,10 @@ Changelog .. note:: - The ReactPy team manages their short and long term plans with `GitHub Projects - `__. If you have questions about what - the team are working on, or have feedback on how issues should be prioritized, feel - free to :discussion-type:`open up a discussion `. - -All notable changes to this project will be recorded in this document. The style of -which is based on `Keep a Changelog `__. The versioning -scheme for the project adheres to `Semantic Versioning `__. For -more info, see the :ref:`Contributor Guide `. + All notable changes to this project will be recorded in this document. The style of + which is based on `Keep a Changelog `__. The versioning + scheme for the project adheres to `Semantic Versioning `__. For + more info, see the :ref:`Contributor Guide `. .. INSTRUCTIONS FOR CHANGELOG CONTRIBUTORS From 9b09ae354454eabc500e0b3f111b8b949cc677e2 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Thu, 15 Jun 2023 00:33:29 -0700 Subject: [PATCH 08/23] Add s --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 91824b559..243ae34b3 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -11,4 +11,4 @@ - [ ] Tests have been included for all bug fixes or added functionality. - [ ] The `changelog.rst` has been updated with any significant changes. -This contribution conforms the project's open source license. +This contribution conforms the project's open source license(s). From 32261770788c7cba7355049ecd148e9382b3f760 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Thu, 15 Jun 2023 19:05:53 -0700 Subject: [PATCH 09/23] add more extensions --- .vscode/extensions.json | 7 ++++++- .vscode/settings.json | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index ea7a72157..29e734939 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -11,6 +11,11 @@ "sourcery.sourcery", "njpwerner.autodocstring", "github.copilot", - "charliermarsh.ruff" + "charliermarsh.ruff", + "elypia.magick-image-reader", + "shd101wyy.markdown-preview-enhanced", + "dbaeumer.vscode-eslint", + "ms-python.black-formatter", + "ms-python.mypy-type-checker" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 9bd0d3a66..7536cbe2f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,14 +2,13 @@ "editor.detectIndentation": false, "editor.formatOnSave": true, "python.linting.enabled": true, - "python.linting.flake8Enabled": true, - "python.linting.pylintEnabled": true, "python.linting.mypyEnabled": true, "python.analysis.typeCheckingMode": "off", "python.languageServer": "Pylance", "python.formatting.provider": "black", + "python.analysis.autoImportCompletions": true, "terminal.integrated.scrollback": 10000, - "git.autofetch": true, + "git.autofetch": "all", "prettier.tabWidth": 4, "prettier.useTabs": true, "prettier.endOfLine": "auto", From c63219d674bb93883a6a6a55abb8be0e78d12114 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:50:04 -0700 Subject: [PATCH 10/23] remove subjective extensions --- .vscode/extensions.json | 9 --------- .vscode/settings.json | 7 +------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 29e734939..7471953dc 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,19 +1,10 @@ { "recommendations": [ - "eamodio.gitlens", - "github.vscode-pull-request-github", "wholroyd.jinja", "esbenp.prettier-vscode", "ms-python.vscode-pylance", "ms-python.python", - "mrmlnc.vscode-autoprefixer", - "gruntfuggly.todo-tree", - "sourcery.sourcery", - "njpwerner.autodocstring", - "github.copilot", "charliermarsh.ruff", - "elypia.magick-image-reader", - "shd101wyy.markdown-preview-enhanced", "dbaeumer.vscode-eslint", "ms-python.black-formatter", "ms-python.mypy-type-checker" diff --git a/.vscode/settings.json b/.vscode/settings.json index 7536cbe2f..62243f142 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,23 +7,18 @@ "python.languageServer": "Pylance", "python.formatting.provider": "black", "python.analysis.autoImportCompletions": true, - "terminal.integrated.scrollback": 10000, "git.autofetch": "all", "prettier.tabWidth": 4, "prettier.useTabs": true, "prettier.endOfLine": "auto", "prettier.proseWrap": "never", - "autoprefixer.formatOnSave": true, "files.associations": { "**/requirements/*.txt": "pip-requirements", "*.py-tpl": "python", "**/templates/**.html": "jinja", "**/template/**.html": "jinja", }, - "[jsonc]": { - "editor.defaultFormatter": "vscode.json-language-features" - }, - "[json]": { + "[json, jsonc]": { "editor.defaultFormatter": "vscode.json-language-features" }, "[javascript]": { From a2e2418570d1d3e7d355d9e491c5ca24ef1bbc8f Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:51:27 -0700 Subject: [PATCH 11/23] remove py-tpl --- .vscode/settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 62243f142..de64a6673 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,7 +14,6 @@ "prettier.proseWrap": "never", "files.associations": { "**/requirements/*.txt": "pip-requirements", - "*.py-tpl": "python", "**/templates/**.html": "jinja", "**/template/**.html": "jinja", }, From ca61e74b54c5d8e4e0a3924a451ad047e53f0295 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:52:37 -0700 Subject: [PATCH 12/23] set black as default formatter --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index de64a6673..f33e400e8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,7 +27,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[python]": { - "editor.defaultFormatter": "ms-python.python", + "editor.defaultFormatter": "ms-python.black-formatter", "editor.codeActionsOnSave": { "source.organizeImports": true } From 2062f06bbdb1cc627cbf70ffe3434fde7d82feba Mon Sep 17 00:00:00 2001 From: Mark Bakhit <16909269+Archmonger@users.noreply.github.com> Date: Wed, 28 Jun 2023 22:24:09 -0700 Subject: [PATCH 13/23] Update .github/pull_request_template.md Co-authored-by: Ryan Morshead --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 243ae34b3..98f8b8ac2 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -11,4 +11,4 @@ - [ ] Tests have been included for all bug fixes or added functionality. - [ ] The `changelog.rst` has been updated with any significant changes. -This contribution conforms the project's open source license(s). +By submitting this pull request you agree that all contributions are made under this project's open source license(s). From 8e1fb38c79aa1137f694d6a2d63bc2af187b5ef7 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Mon, 3 Jul 2023 20:38:16 -0700 Subject: [PATCH 14/23] re-add vscode to gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fd333c3e4..946bff43f 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,7 @@ pip-wheel-metadata # --- IDE --- .idea -.vscode/*/ +.vscode # --- JS --- node_modules From ba4845af5c6c3f91d1e67a8a31ec274270024693 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Sat, 15 Jul 2023 17:27:27 -0700 Subject: [PATCH 15/23] remove auto import completion --- .vscode/settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f33e400e8..ce3ca5ff2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,7 +6,6 @@ "python.analysis.typeCheckingMode": "off", "python.languageServer": "Pylance", "python.formatting.provider": "black", - "python.analysis.autoImportCompletions": true, "git.autofetch": "all", "prettier.tabWidth": 4, "prettier.useTabs": true, From 88818f9cff93e441a160cd02cb3c380047a25a11 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Mon, 17 Jul 2023 17:03:06 -0700 Subject: [PATCH 16/23] Update pull request template --- .github/pull_request_template.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 3f553e7a7..b636658fb 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,18 +1,15 @@ -## Summary - - - ## Issues ## Solution - + ## Checklist - [ ] Tests have been included for all bug fixes or added functionality. - [ ] The `changelog.rst` has been updated with any significant changes. +- [ ] The documentation has been updated, if needed. By submitting this pull request you agree that all contributions are made under this project's open source license(s). From 926211e0b1137eb55f18a94edb86a8283f3f86ee Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Mon, 17 Jul 2023 17:14:54 -0700 Subject: [PATCH 17/23] remove stuff --- .vscode/settings.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ce3ca5ff2..fa91d76c0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,21 +2,18 @@ "editor.detectIndentation": false, "editor.formatOnSave": true, "python.linting.enabled": true, - "python.linting.mypyEnabled": true, "python.analysis.typeCheckingMode": "off", "python.languageServer": "Pylance", "python.formatting.provider": "black", "git.autofetch": "all", "prettier.tabWidth": 4, - "prettier.useTabs": true, "prettier.endOfLine": "auto", "prettier.proseWrap": "never", "files.associations": { - "**/requirements/*.txt": "pip-requirements", "**/templates/**.html": "jinja", "**/template/**.html": "jinja", }, - "[json, jsonc]": { + "[json]": { "editor.defaultFormatter": "vscode.json-language-features" }, "[javascript]": { @@ -26,7 +23,6 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[python]": { - "editor.defaultFormatter": "ms-python.black-formatter", "editor.codeActionsOnSave": { "source.organizeImports": true } From 9e9664ce68165b6f757d3156f489433220566bd9 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Mon, 17 Jul 2023 17:16:43 -0700 Subject: [PATCH 18/23] sort json --- .vscode/settings.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index fa91d76c0..1531b1306 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,31 +1,31 @@ { - "editor.detectIndentation": false, - "editor.formatOnSave": true, - "python.linting.enabled": true, - "python.analysis.typeCheckingMode": "off", - "python.languageServer": "Pylance", - "python.formatting.provider": "black", - "git.autofetch": "all", - "prettier.tabWidth": 4, - "prettier.endOfLine": "auto", - "prettier.proseWrap": "never", - "files.associations": { - "**/templates/**.html": "jinja", - "**/template/**.html": "jinja", - }, - "[json]": { - "editor.defaultFormatter": "vscode.json-language-features" + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "[css]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "[json]": { + "editor.defaultFormatter": "vscode.json-language-features" }, "[python]": { "editor.codeActionsOnSave": { "source.organizeImports": true } }, - "files.insertFinalNewline": true + "editor.detectIndentation": false, + "editor.formatOnSave": true, + "files.associations": { + "**/template/**.html": "jinja", + "**/templates/**.html": "jinja" + }, + "files.insertFinalNewline": true, + "git.autofetch": "all", + "prettier.endOfLine": "auto", + "prettier.proseWrap": "never", + "prettier.tabWidth": 4, + "python.analysis.typeCheckingMode": "off", + "python.formatting.provider": "black", + "python.languageServer": "Pylance", + "python.linting.enabled": true } From 0be93c7c6ae948e9fe2103891a47c2c9f490d7ea Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Tue, 8 Aug 2023 15:58:33 -0700 Subject: [PATCH 19/23] remove newly deprecated settings --- .vscode/settings.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1531b1306..82637b3bc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,7 +25,5 @@ "prettier.proseWrap": "never", "prettier.tabWidth": 4, "python.analysis.typeCheckingMode": "off", - "python.formatting.provider": "black", "python.languageServer": "Pylance", - "python.linting.enabled": true } From cdadb0d01e831c6a065f4c0f3999f783b4c12f52 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 9 Aug 2023 18:04:32 -0700 Subject: [PATCH 20/23] remove jinja associations --- .vscode/settings.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 82637b3bc..f40020bea 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,10 +15,6 @@ }, "editor.detectIndentation": false, "editor.formatOnSave": true, - "files.associations": { - "**/template/**.html": "jinja", - "**/templates/**.html": "jinja" - }, "files.insertFinalNewline": true, "git.autofetch": "all", "prettier.endOfLine": "auto", From 3996ae6953a52930625f3de7a44714c65802da73 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 10 Jan 2024 18:37:20 -0800 Subject: [PATCH 21/23] Remove settings.json --- .vscode/settings.json | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index f40020bea..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "[css]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[json]": { - "editor.defaultFormatter": "vscode.json-language-features" - }, - "[python]": { - "editor.codeActionsOnSave": { - "source.organizeImports": true - } - }, - "editor.detectIndentation": false, - "editor.formatOnSave": true, - "files.insertFinalNewline": true, - "git.autofetch": "all", - "prettier.endOfLine": "auto", - "prettier.proseWrap": "never", - "prettier.tabWidth": 4, - "python.analysis.typeCheckingMode": "off", - "python.languageServer": "Pylance", -} From 200ae13db2465e2c4cc939669cded98766319428 Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Wed, 10 Jan 2024 18:39:28 -0800 Subject: [PATCH 22/23] Update pull request template --- .github/pull_request_template.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b636658fb..375494b22 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,15 +1,14 @@ -## Issues +## Description - + -## Solution +## Checklist: - + -## Checklist +- [ ] Tests have been developed for bug fixes or new functionality. +- [ ] The changelog has been updated, if necessary. +- [ ] Documentation has been updated, if necessary. +- [ ] GitHub Issues closed by this PR have been linked. -- [ ] Tests have been included for all bug fixes or added functionality. -- [ ] The `changelog.rst` has been updated with any significant changes. -- [ ] The documentation has been updated, if needed. - -By submitting this pull request you agree that all contributions are made under this project's open source license(s). +By submitting this pull request you agree that all contributions comply with this project's open source license(s). From 131fe0a758c8d5bc78be71ce24f826a2f092394b Mon Sep 17 00:00:00 2001 From: Archmonger <16909269+Archmonger@users.noreply.github.com> Date: Tue, 5 Mar 2024 18:41:46 -0800 Subject: [PATCH 23/23] Misc cleanup --- .github/pull_request_template.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 375494b22..a55532008 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,13 +2,13 @@ -## Checklist: +## Checklist - +Please update this checklist as you complete each item: - [ ] Tests have been developed for bug fixes or new functionality. - [ ] The changelog has been updated, if necessary. - [ ] Documentation has been updated, if necessary. - [ ] GitHub Issues closed by this PR have been linked. -By submitting this pull request you agree that all contributions comply with this project's open source license(s). +By submitting this pull request I agree that all contributions comply with this project's open source license(s).