From 97419b34defbddcaea6aeab04e77dd5af14a25f3 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Fri, 25 Mar 2022 14:12:02 -0400
Subject: [PATCH 1/2] reorder pre-commit config

Committed via https://github.com/asottile/all-repos
---
 .pre-commit-config.yaml                       | 47 +++++++------------
 .../resources/python3_hooks_repo/py3_hook.py  |  2 +
 testing/resources/python3_hooks_repo/setup.py |  2 +
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a80505b0c..6f1fafd20 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,53 +4,40 @@ repos:
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
-    -   id: check-docstring-first
-    -   id: check-json
     -   id: check-yaml
     -   id: debug-statements
+    -   id: double-quote-string-fixer
     -   id: name-tests-test
     -   id: requirements-txt-fixer
-    -   id: double-quote-string-fixer
--   repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
-    hooks:
-    -   id: flake8
-        additional_dependencies: [flake8-typing-imports==1.12.0]
--   repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v1.6.0
-    hooks:
-    -   id: autopep8
--   repo: https://github.com/pre-commit/pre-commit
-    rev: v2.17.0
-    hooks:
-    -   id: validate_manifest
--   repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
+-   repo: https://github.com/asottile/setup-cfg-fmt
+    rev: v1.20.0
     hooks:
-    -   id: pyupgrade
-        args: [--py37-plus]
+    -   id: setup-cfg-fmt
 -   repo: https://github.com/asottile/reorder_python_imports
     rev: v3.0.1
     hooks:
     -   id: reorder-python-imports
         args: [--py37-plus, --add-import, 'from __future__ import annotations']
-        exclude: ^testing/resources/python3_hooks_repo/
 -   repo: https://github.com/asottile/add-trailing-comma
     rev: v2.2.1
     hooks:
     -   id: add-trailing-comma
         args: [--py36-plus]
--   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.20.0
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v2.31.1
     hooks:
-    -   id: setup-cfg-fmt
+    -   id: pyupgrade
+        args: [--py37-plus]
+-   repo: https://github.com/pre-commit/mirrors-autopep8
+    rev: v1.6.0
+    hooks:
+    -   id: autopep8
+-   repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+    -   id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.941
+    rev: v0.942
     hooks:
     -   id: mypy
         additional_dependencies: [types-all]
-        exclude: ^testing/resources/
--   repo: meta
-    hooks:
-    -   id: check-hooks-apply
-    -   id: check-useless-excludes
diff --git a/testing/resources/python3_hooks_repo/py3_hook.py b/testing/resources/python3_hooks_repo/py3_hook.py
index 8c9cda4c6..fd64ce8dd 100644
--- a/testing/resources/python3_hooks_repo/py3_hook.py
+++ b/testing/resources/python3_hooks_repo/py3_hook.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 
 
diff --git a/testing/resources/python3_hooks_repo/setup.py b/testing/resources/python3_hooks_repo/setup.py
index 9125dc1df..49e1e2cc7 100644
--- a/testing/resources/python3_hooks_repo/setup.py
+++ b/testing/resources/python3_hooks_repo/setup.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from setuptools import setup
 
 setup(

From 3b9804062334d69582ff04299d22a8d2df60460a Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Fri, 25 Mar 2022 14:31:33 -0400
Subject: [PATCH 2/2] fix pre-commit issues

---
 .pre-commit-config.yaml                          | 2 ++
 testing/resources/python3_hooks_repo/py3_hook.py | 2 --
 testing/resources/python3_hooks_repo/setup.py    | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6f1fafd20..5525d71d7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,6 +17,7 @@ repos:
     rev: v3.0.1
     hooks:
     -   id: reorder-python-imports
+        exclude: ^testing/resources/python3_hooks_repo/
         args: [--py37-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/add-trailing-comma
     rev: v2.2.1
@@ -41,3 +42,4 @@ repos:
     hooks:
     -   id: mypy
         additional_dependencies: [types-all]
+        exclude: ^testing/resources/
diff --git a/testing/resources/python3_hooks_repo/py3_hook.py b/testing/resources/python3_hooks_repo/py3_hook.py
index fd64ce8dd..8c9cda4c6 100644
--- a/testing/resources/python3_hooks_repo/py3_hook.py
+++ b/testing/resources/python3_hooks_repo/py3_hook.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import sys
 
 
diff --git a/testing/resources/python3_hooks_repo/setup.py b/testing/resources/python3_hooks_repo/setup.py
index 49e1e2cc7..9125dc1df 100644
--- a/testing/resources/python3_hooks_repo/setup.py
+++ b/testing/resources/python3_hooks_repo/setup.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from setuptools import setup
 
 setup(