From 9d68e4e3da4ce68e28506d926c7de9fd6ffbf6a3 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 4 Apr 2022 20:42:14 +0200
Subject: Merging upstream version 2.18.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .pre-commit-config.yaml | 50 ++++++++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

(limited to '.pre-commit-config.yaml')

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 66b50a4..1b93cff 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,52 +4,42 @@ 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.10.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.0
+-   repo: https://github.com/asottile/setup-cfg-fmt
+    rev: v1.20.0
     hooks:
-    -   id: pyupgrade
-        args: [--py36-plus]
+    -   id: setup-cfg-fmt
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.6.0
+    rev: v3.0.1
     hooks:
     -   id: reorder-python-imports
-        args: [--py3-plus]
+        exclude: ^(pre_commit/resources/|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
     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.931
+    rev: v0.942
     hooks:
     -   id: mypy
         additional_dependencies: [types-all]
         exclude: ^testing/resources/
--   repo: meta
-    hooks:
-    -   id: check-hooks-apply
-    -   id: check-useless-excludes
-- 
cgit v1.2.3