fix: merge conflicts in check run json

agritheory · Jan 21, 2025 · 3ba62db · 3ba62db
1 parent cf5de05
commit 3ba62db
Show file tree

Hide file tree

Showing 3 changed files with 149 additions and 437 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 exclude: 'node_modules|.git'
-default_stages: [commit]
+default_stages: [pre-commit]
 fail_fast: false
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         files: 'check_run.*'
@@ -20,58 +20,56 @@ repos:
       - id: debug-statements
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: ['--py310-plus']
 
-  - repo: https://github.com/frappe/black
+  - repo: https://github.com/agritheory/black
     rev: 951ccf4d5bb0d692b457a5ebc4215d755618eb68
     hooks:
       - id: black
 
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
+  - repo: https://github.com/PyCQA/autoflake
+    rev: v2.3.1
     hooks:
-      - id: prettier
-        types_or: [javascript]
-        # Ignore any files that might contain jinja / bundles
-        exclude: |
-          (?x)^(
-              check_run/public/dist/.*|
-              .*node_modules.*|
-              .*boilerplate.*|
-              check_run/www/website_script.js|
-              check_run/templates/includes/.*|
-              check_run/public/js/lib/.*
-          )$
+      - id: autoflake
+        args: [--remove-all-unused-imports, --in-place]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 7.1.1
     hooks:
       - id: flake8
         additional_dependencies: ['flake8-bugbear']
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.5.1
+    rev: v1.14.1
     hooks:
       - id: mypy
         exclude: ^tests/
         args: [--ignore-missing-imports]
 
-  - repo: local
+  - repo: https://github.com/agritheory/test_utils
+    rev: v0.17.0
     hooks:
+      - id: update_pre_commit_config
+      - id: validate_copyright
+        files: '\.(js|ts|py|md)$'
+        args: ['--app', 'check_run']
       - id: validate_customizations
-        always_run: true
-        name: .github/validate_customizations.py
-        entry: python .github/validate_customizations.py
-        language: system
-        types: [python]
+      # - id: validate_python_dependencies
+
+  - repo: local
+    hooks:
+      - id: prettier
+        name: prettier
+        entry: npx prettier . --write --ignore-path .prettierignore
+        language: node
 
 ci:
   autoupdate_schedule: weekly

diff --git a/check_run/check_run/doctype/check_run/check_run.json b/check_run/check_run/doctype/check_run/check_run.json
@@ -27,8 +27,7 @@
 		"print_count",
 		"status",
 		"ach_file_generated",
-    "sepa_file_generated"
-
+		"sepa_file_generated"
 	],
 	"fields": [
 		{
@@ -167,16 +166,14 @@
 			"fieldtype": "Check",
 			"hidden": 1,
 			"label": "Ach File Generated"
-
-		},
-    {
-        "allow_on_submit": 1,
-        "default": "0",
-        "fieldname": "sepa_file_generated",
-        "fieldtype": "Check",
-        "hidden": 1
-    }
-
+		},
+		{
+			"allow_on_submit": 1,
+			"default": "0",
+			"fieldname": "sepa_file_generated",
+			"fieldtype": "Check",
+			"hidden": 1
+		}
 	],
 	"is_submittable": 1,
 	"links": [],
@@ -215,4 +212,4 @@
 	"track_changes": 1,
 	"track_seen": 1,
 	"track_views": 1
-}
+}