Move checks to the end

It's better to reformat first and then lint later, or linters could fail with stuff that is later fixed when reformatting.
copier-org · Dec 10, 2020 · 6ceb928 · 6ceb928
1 parent 276a094
commit 6ceb928
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 67 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,34 +10,6 @@ repos:
         entry: found forbidden files; remove them
         language: fail
         files: "\\.rej$"
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
-    hooks:
-      - id: check-added-large-files
-        args:
-          - --maxkb=1000
-      - id: check-case-conflict
-      - id: check-executables-have-shebangs
-      - id: check-json
-      - id: check-merge-conflict
-      - id: check-symlinks
-      - id: check-toml
-      - id: check-xml
-      - id: check-yaml
-      - id: detect-private-key
-      - id: end-of-file-fixer
-      - id: mixed-line-ending
-        args:
-          - --fix=lf
-      - id: trailing-whitespace
-      - id: check-ast
-      - id: check-builtin-literals
-      - id: check-docstring-first
-      - id: debug-statements
-      - id: fix-encoding-pragma
-        args:
-          - --remove
-      - id: requirements-txt-fixer
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.1.2
     hooks:
@@ -87,3 +59,31 @@ repos:
           # ignore unused imports in __init__.py
           - --extend-ignore=F401
         files: /__init__\.py$
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+      - id: check-added-large-files
+        args:
+          - --maxkb=1000
+      - id: check-case-conflict
+      - id: check-executables-have-shebangs
+      - id: check-json
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-xml
+      - id: check-yaml
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args:
+          - --fix=lf
+      - id: trailing-whitespace
+      - id: check-ast
+      - id: check-builtin-literals
+      - id: check-docstring-first
+      - id: debug-statements
+      - id: fix-encoding-pragma
+        args:
+          - --remove
+      - id: requirements-txt-fixer
diff --git a/.pre-commit-config.yaml.jinja b/.pre-commit-config.yaml.jinja
@@ -10,45 +10,6 @@ repos:
         entry: found forbidden files; remove them
         language: fail
         files: "\\.rej$"
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
-    hooks:
-    {%- if biggest_kbs %}
-      - id: check-added-large-files
-        args:
-          - --maxkb={{ biggest_kbs }}
-    {%- endif %}
-      - id: check-case-conflict
-      - id: check-executables-have-shebangs
-      - id: check-json
-      - id: check-merge-conflict
-      - id: check-symlinks
-      - id: check-toml
-      - id: check-xml
-      - id: check-yaml
-      - id: detect-private-key
-      - id: end-of-file-fixer
-      - id: mixed-line-ending
-        args:
-          - --fix=lf
-    {%- if protected_branches %}
-      - id: no-commit-to-branch
-        args:
-        {%- for branch in protected_branches %}
-          - --branch={{ branch }}
-        {%- endfor %}
-    {%- endif %}
-      - id: trailing-whitespace
-    {%- if python %}
-      - id: check-ast
-      - id: check-builtin-literals
-      - id: check-docstring-first
-      - id: debug-statements
-      - id: fix-encoding-pragma
-        args:
-          - --remove
-      - id: requirements-txt-fixer
-    {%- endif %}
   {#- Prettier is considered general because it reformats Markdown, YAML and XML
      (with the activated plugin), which are too common as to ask the user,
      although it's true that it will also format JS, HTML, CSS and others #}
@@ -123,3 +84,42 @@ repos:
     hooks:
       - id: ansible-lint
 {%- endif %}
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+    {%- if biggest_kbs %}
+      - id: check-added-large-files
+        args:
+          - --maxkb={{ biggest_kbs }}
+    {%- endif %}
+      - id: check-case-conflict
+      - id: check-executables-have-shebangs
+      - id: check-json
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-xml
+      - id: check-yaml
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args:
+          - --fix=lf
+    {%- if protected_branches %}
+      - id: no-commit-to-branch
+        args:
+        {%- for branch in protected_branches %}
+          - --branch={{ branch }}
+        {%- endfor %}
+    {%- endif %}
+      - id: trailing-whitespace
+    {%- if python %}
+      - id: check-ast
+      - id: check-builtin-literals
+      - id: check-docstring-first
+      - id: debug-statements
+      - id: fix-encoding-pragma
+        args:
+          - --remove
+      - id: requirements-txt-fixer
+    {%- endif %}