From 704e13a7e0154fb5640428dd277a7d0713745443 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 13 Apr 2025 16:45:09 +0900
Subject: [PATCH] Use pre-commit to run format check

Change-Id: Ie91c1e1623c9c2712effa98bdbb39a0895677933
---
 .pre-commit-config.yaml | 25 +++++++++++++++++++++++++
 test-requirements.txt   |  2 --
 tox.ini                 |  5 ++++-
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..d1748493
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,25 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      # Replaces or checks mixed line ending
+      - id: mixed-line-ending
+        args: ['--fix', 'lf']
+        exclude: '.*\.(svg)$'
+      # Forbid files which have a UTF-8 byte-order marker
+      - id: check-byte-order-marker
+      # Checks that non-binary executables have a proper shebang
+      - id: check-executables-have-shebangs
+      # Check for files that contain merge conflict strings.
+      - id: check-merge-conflict
+      # Check for debugger imports and py37+ breakpoint()
+      # calls in python source
+      - id: debug-statements
+      - id: check-yaml
+        files: .*\.(yaml|yml)$
+  - repo: https://opendev.org/openstack/hacking
+    rev: 7.0.0
+    hooks:
+      - id: hacking
+        additional_dependencies: []
diff --git a/test-requirements.txt b/test-requirements.txt
index 475d75ea..cbf85ddf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,3 @@
-# Hacking already pins down pep8, pyflakes and flake8
-hacking>=6.1.0,<6.2.0 # Apache-2.0
 coverage>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 requests-mock>=1.2.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index c83b391e..90bdf1e4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,11 @@ allowlist_externals = find
 commands = oslo_debug_helper -t heatclient/tests {posargs}
 
 [testenv:pep8]
+skip_install = true
+deps =
+  pre-commit
 commands =
-    flake8
+  pre-commit run -a
 
 [testenv:venv]
 commands = {posargs}