Organize pre-commit setup (#757)

johnnv1 · web-flow · commit 6f0aa9d2e0e5 · 2022-06-06T18:36:30.000+01:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,53 +1,32 @@
-exclude: docs
+exclude: "(^dynaconf/vendor+.|^venv/+.|^.venv/+.|^env/+.|^.tox/+.|^build/+.|docs)"
+default_language_version:
+    python: python3
 repos:
-  - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.0.1
-    hooks:
-      - id: reorder-python-imports
-        language_version: python3
-        args: [--py3-plus]
-        exclude: &exc "(^dynaconf/vendor+.|^venv/+.|^.venv/+.|^env/+.|^.tox/+.|^build/+.)"
-  - repo: https://github.com/ambv/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-        args: [--line-length=79]
-        language_version: python3
-        exclude: *exc
-
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.942
-    hooks:
-      - id: mypy
-        files: ^dynaconf/
-        exclude: *exc
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: trailing-whitespace
-        language_version: python3
-        exclude: *exc
       - id: end-of-file-fixer
-        language_version: python3
-        exclude: *exc
       - id: check-yaml
-        language_version: python3
-        exclude: *exc
       - id: check-merge-conflict
-        language_version: python3
-        exclude: *exc
       - id: debug-statements
-        language_version: python3
-        exclude: *exc
       - id: fix-encoding-pragma
-        language_version: python3
-        exclude: *exc
         args: [--remove]
+  - repo: https://github.com/asottile/reorder_python_imports
+    rev: v3.1.0
+    hooks:
+      - id: reorder-python-imports
+  - repo: https://github.com/ambv/black
+    rev: 22.3.0
+    hooks:
+      - id: black
+        args: [--line-length=79]
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.9.2
     hooks:
       - id: flake8
-        args: ['--ignore=F403,W504,W503,F841,E401,F401,E402']
-        language_version: python3
-        exclude: *exc
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.960
+    hooks:
+      - id: mypy
+        files: ^dynaconf/
diff --git a/Makefile b/Makefile
@@ -192,16 +192,11 @@ test_all: test_examples test_integration test_redis test_vault test
 install:
 	pip install --upgrade pip
 	pip install -r requirements_dev.txt
-	make setup-pre-commit
-
-setup-pre-commit:
-	pre-commit install
-	pre-commit install-hooks
 
 run-pre-commit:
 	rm -rf .tox/
 	rm -rf build/
-	pre-commit run --files $$(find -regex '.*\.\(py\|yaml\|yml\|md\)') -v
+	pre-commit run --all-files
 
 pep8:
 	# Flake8 ignores
diff --git a/example/ignore_unknown_envvars/.env b/example/ignore_unknown_envvars/.env
@@ -8,4 +8,4 @@ MYAPP_SECRET=hunter1
 VAR1=bar
 
 # Wanted, prefixed variable.
-MYAPP_VAR1=ham
+MYAPP_VAR1=ham
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,16 @@
 [bdist_wheel]
 universal = 1
 
+[flake8]
+ignore = F403
+         W504
+         W503
+         F841
+         E401
+         F401
+         E402
+max-line-length = 79
+
 [mypy]
 ignore_missing_imports = True
 
