From e01e78b701c76b0f25deea477b0c65d098c6ece6 Mon Sep 17 00:00:00 2001 From: elvis kahoro <elvis@reflex.dev> Date: Thu, 1 Aug 2024 18:16:29 -0700 Subject: [PATCH 1/9] chore: Adding trunk init with sensible config --- .trunk/.gitignore | 9 +++++++ .trunk/trunk.yaml | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 .trunk/.gitignore create mode 100644 .trunk/trunk.yaml diff --git a/.trunk/.gitignore b/.trunk/.gitignore new file mode 100644 index 00000000000..15966d087eb --- /dev/null +++ b/.trunk/.gitignore @@ -0,0 +1,9 @@ +*out +*logs +*actions +*notifications +*tools +plugins +user_trunk.yaml +user.yaml +tmp diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml new file mode 100644 index 00000000000..0011d6016f7 --- /dev/null +++ b/.trunk/trunk.yaml @@ -0,0 +1,60 @@ +# This file controls the behavior of Trunk: https://docs.trunk.io/cli +# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml +version: 0.1 +cli: + version: 1.22.2 +# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins) +plugins: + sources: + - id: trunk + ref: v1.6.1 + uri: https://github.com/trunk-io/plugins +# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes) +runtimes: + enabled: + - python@>3.8.0 + definitions: + - type: python + system_version: allowed +# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration) +lint: + enabled: + - actionlint@1.7.1 + - bandit@1.7.9 + - black@24.8.0 + - checkov@3.2.222 + - flake8@7.1.1 + - git-diff-check + - hadolint@2.12.0 + - isort@5.13.2 + - markdownlint@0.41.0 + - mypy@1.11.1 + - osv-scanner@1.8.3 + - oxipng@9.1.2 + - prettier@3.3.3 + - pylint@3.2.6 + - pyright@1.1.375 + - ruff@0.5.7 + - shellcheck@0.10.0 + - shfmt@3.6.0 + - stylelint@16.8.1 + - svgo@3.3.2 + - taplo@0.9.3 + - trivy@0.54.1 + - trufflehog@3.81.8 + - yamllint@1.35.1 + ignore: + - linters: [ALL] + paths: + - "**/*.pyi" + - linters: [bandit] + paths: + - integration/** + - tests/** +actions: + disabled: + - trunk-fmt-pre-commit + enabled: + - trunk-announce + - trunk-check-pre-push + - trunk-upgrade-available From fa71100e57851826a57f8b1777b6d99b59f90a00 Mon Sep 17 00:00:00 2001 From: elvis kahoro <elvis@reflex.dev> Date: Tue, 13 Aug 2024 12:44:48 -0700 Subject: [PATCH 2/9] Removing mypy since pyright covers cases but with more performance https://htmlpreview.github.io/?https://github.com/python/typing/blob/main/conformance/results/results.html --- .trunk/trunk.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 0011d6016f7..d9a7b016d23 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -28,7 +28,6 @@ lint: - hadolint@2.12.0 - isort@5.13.2 - markdownlint@0.41.0 - - mypy@1.11.1 - osv-scanner@1.8.3 - oxipng@9.1.2 - prettier@3.3.3 From bef2671ef1715c43e6d2b1544996c28dd2ef6e9e Mon Sep 17 00:00:00 2001 From: elvis kahoro <elvis@reflex.dev> Date: Tue, 13 Aug 2024 13:28:50 -0700 Subject: [PATCH 3/9] Having pyright ignore test files --- .trunk/trunk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index d9a7b016d23..8d7aa3009d7 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -46,7 +46,7 @@ lint: - linters: [ALL] paths: - "**/*.pyi" - - linters: [bandit] + - linters: [bandit, pyright] paths: - integration/** - tests/** From c8189a471f4c67925760df1262fc1262a487cd7f Mon Sep 17 00:00:00 2001 From: elvis kahoro <elvis@reflex.dev> Date: Mon, 19 Aug 2024 16:08:33 -0700 Subject: [PATCH 4/9] Preventing trunk check on pre-push --- .trunk/trunk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 8d7aa3009d7..04da05aa840 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -53,7 +53,7 @@ lint: actions: disabled: - trunk-fmt-pre-commit + - trunk-check-pre-push enabled: - trunk-announce - - trunk-check-pre-push - trunk-upgrade-available From ddb128762441dcd9767a4cb667f8947e6c0a3e2e Mon Sep 17 00:00:00 2001 From: elvis kahoro <elvis@reflex.dev> Date: Mon, 19 Aug 2024 16:10:30 -0700 Subject: [PATCH 5/9] Updating linters --- .trunk/trunk.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 04da05aa840..d2ea3b6be08 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -2,7 +2,7 @@ # To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml version: 0.1 cli: - version: 1.22.2 + version: 1.22.3 # Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins) plugins: sources: @@ -18,11 +18,14 @@ runtimes: system_version: allowed # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration) lint: + disabled: + - remark-lint + - mypy enabled: - actionlint@1.7.1 - bandit@1.7.9 - black@24.8.0 - - checkov@3.2.222 + - checkov@3.2.231 - flake8@7.1.1 - git-diff-check - hadolint@2.12.0 @@ -32,15 +35,15 @@ lint: - oxipng@9.1.2 - prettier@3.3.3 - pylint@3.2.6 - - pyright@1.1.375 - - ruff@0.5.7 + - pyright@1.1.376 + - ruff@0.6.1 - shellcheck@0.10.0 - shfmt@3.6.0 - - stylelint@16.8.1 + - stylelint@16.8.2 - svgo@3.3.2 - taplo@0.9.3 - trivy@0.54.1 - - trufflehog@3.81.8 + - trufflehog@3.81.9 - yamllint@1.35.1 ignore: - linters: [ALL] From f606b30ad4a109af0378f08a1876a32b13bce3a4 Mon Sep 17 00:00:00 2001 From: elvis kahoro <elvis@reflex.dev> Date: Mon, 19 Aug 2024 17:48:27 -0700 Subject: [PATCH 6/9] removing flake8 --- .trunk/trunk.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index d2ea3b6be08..d2fe7445732 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -19,14 +19,15 @@ runtimes: # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration) lint: disabled: - - remark-lint + - flake8 - mypy + - pylint + - remark-lint enabled: - actionlint@1.7.1 - bandit@1.7.9 - black@24.8.0 - checkov@3.2.231 - - flake8@7.1.1 - git-diff-check - hadolint@2.12.0 - isort@5.13.2 @@ -34,7 +35,6 @@ lint: - osv-scanner@1.8.3 - oxipng@9.1.2 - prettier@3.3.3 - - pylint@3.2.6 - pyright@1.1.376 - ruff@0.6.1 - shellcheck@0.10.0 From f87607e9b07d788ad22943dc22397e1ded600359 Mon Sep 17 00:00:00 2001 From: elvis kahoro <elvis@reflex.dev> Date: Mon, 19 Aug 2024 17:52:17 -0700 Subject: [PATCH 7/9] disabling prettier --- .trunk/trunk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index d2fe7445732..32b96eee283 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -19,6 +19,7 @@ runtimes: # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration) lint: disabled: + - prettier - flake8 - mypy - pylint @@ -34,7 +35,6 @@ lint: - markdownlint@0.41.0 - osv-scanner@1.8.3 - oxipng@9.1.2 - - prettier@3.3.3 - pyright@1.1.376 - ruff@0.6.1 - shellcheck@0.10.0 From 0ebaa3223764ed151028d8dfb22487f40c308bf2 Mon Sep 17 00:00:00 2001 From: elvis kahoro <elvis@reflex.dev> Date: Mon, 19 Aug 2024 17:55:36 -0700 Subject: [PATCH 8/9] Removing more linters --- .trunk/trunk.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 32b96eee283..db2dfa16099 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -19,11 +19,12 @@ runtimes: # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration) lint: disabled: - - prettier - flake8 - mypy + - prettier - pylint - remark-lint + - stylelint enabled: - actionlint@1.7.1 - bandit@1.7.9 @@ -39,7 +40,6 @@ lint: - ruff@0.6.1 - shellcheck@0.10.0 - shfmt@3.6.0 - - stylelint@16.8.2 - svgo@3.3.2 - taplo@0.9.3 - trivy@0.54.1 From e8ecd1de6cc9420c411e13893795304ff3c688c5 Mon Sep 17 00:00:00 2001 From: elvis kahoro <elvis@reflex.dev> Date: Mon, 19 Aug 2024 17:56:14 -0700 Subject: [PATCH 9/9] markdown lint --- .trunk/trunk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index db2dfa16099..78a221eba71 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -20,6 +20,7 @@ runtimes: lint: disabled: - flake8 + - markdownlint - mypy - prettier - pylint @@ -33,7 +34,6 @@ lint: - git-diff-check - hadolint@2.12.0 - isort@5.13.2 - - markdownlint@0.41.0 - osv-scanner@1.8.3 - oxipng@9.1.2 - pyright@1.1.376