From 0e2010d93055d94834cc5faf2733941e49fd6a1f Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Thu, 28 Mar 2024 10:21:40 +0000
Subject: [PATCH] pre-commit: Bump version, add doc8

Change-Id: I2319edaf17589e22567c352d3d79cb925febbd8d
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 .pre-commit-config.yaml | 27 +++++++++------------------
 tox.ini                 |  8 +++-----
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9b908c6d..b1b958c0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,15 +1,6 @@
-# We from the Oslo project decided to pin repos based on the
-# commit hash instead of the version tag to prevend arbitrary
-# code from running in developer's machines.  To update to a
-# newer version, run `pre-commit autoupdate` and then replace
-# the newer versions with their commit hash.
-
-default_language_version:
-  python: python3
-
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       # Replaces or checks mixed line ending
@@ -27,13 +18,13 @@ repos:
       - id: debug-statements
       - id: check-yaml
         files: .*\.(yaml|yml)$
-  - repo: local
+  - repo: https://opendev.org/openstack/hacking
+    rev: 6.1.0
     hooks:
-      - id: flake8
-        name: flake8
-        additional_dependencies:
-          - hacking>=6.1.0,<6.2.0
-        language: python
-        entry: flake8
-        files: '^.*\.py$'
+      - id: hacking
+        additional_dependencies: []
         exclude: '^(doc|releasenotes|tools)/.*$'
+  - repo: https://github.com/PyCQA/doc8
+    rev: v1.1.1
+    hooks:
+      - id: doc8
diff --git a/tox.ini b/tox.ini
index 7eb5b2a0..2cf5fb66 100644
--- a/tox.ini
+++ b/tox.ini
@@ -64,12 +64,10 @@ deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pep8]
-deps = hacking>=4.0.0,<4.1.0
-      doc8
-      pre-commit>=2.6.0
+deps =
+    pre-commit
 commands =
-    pre-commit run -a
-    doc8 doc/source
+    pre-commit run --all-files --show-diff-on-failure
 
 [flake8]
 exclude=.venv,.git,.tox,dist,*egg,*.egg-info,build,examples,doc