From 5bbc92d16464e1c2306c4f64d335124b83daf631 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 31 Oct 2024 12:39:15 +0900
Subject: [PATCH] pre-commit: Bump versions

... and use native hooks for bandit and hacking

Change-Id: Ia60ca0082a1b4d99905f523f8977db5275e06658
---
 .pre-commit-config.yaml          | 29 ++++++++++-------------------
 oslo_vmware/objects/datastore.py |  7 ++++---
 test-requirements.txt            |  6 +-----
 tox.ini                          |  7 ++-----
 4 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 08aef91b..85377edb 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: v5.0.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: 7.0.0
     hooks:
-      - id: flake8
-        name: flake8
-        additional_dependencies:
-          - hacking>=3.0.1,<3.1.0
-        language: python
-        entry: flake8
-        files: '^.*\.py$'
-        exclude: '^(doc|releasenotes|tools)/.*$'
+      - id: hacking
+        additional_dependencies: []
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.7.10
+    hooks:
+      - id: bandit
+        args: ['-x', 'tests']
diff --git a/oslo_vmware/objects/datastore.py b/oslo_vmware/objects/datastore.py
index 56b85f08..e2d34550 100644
--- a/oslo_vmware/objects/datastore.py
+++ b/oslo_vmware/objects/datastore.py
@@ -220,8 +220,8 @@ class Datastore(object):
                                   session.vim, self.ref, 'summary')
 
     def get_connected_hosts(self, session):
-        """Get a list of usable (accessible, mounted, read-writable) hosts where
-        the datastore is mounted.
+        """Get a list of usable (accessible, mounted, read-writable) hosts
+        where the datastore is mounted.
 
         :param: session: session
         :return: list of HostSystem managed object references
@@ -336,7 +336,8 @@ class DatastorePath(object):
         return self._rel_path
 
     def join(self, *paths):
-        """Join one or more path components intelligently into a datastore path.
+        """Join one or more path components intelligently into a datastore
+        path.
 
         If any component is an absolute path, all previous components are
         thrown away, and joining continues. The return value is the
diff --git a/test-requirements.txt b/test-requirements.txt
index e7c8084e..6cf3533c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,4 @@
-# Hacking already pins down pep8, pyflakes and flake8
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=7.0.0,<7.1.0 # Apache-2.0
 
 fixtures>=3.0.0 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
@@ -9,8 +8,5 @@ stestr>=2.0.0 # Apache-2.0
 #  [testenv:cover]
 #  deps = {[testenv]deps} coverage
 coverage!=4.4,>=4.0 # Apache-2.0
-bandit>=1.7.0,<1.8.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 oslo.context>=2.19.2 # Apache-2.0
-
-pre-commit>=2.6.0 # MIT
diff --git a/tox.ini b/tox.ini
index 1a9e0a15..6ce76ca2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,13 +10,10 @@ deps =
 commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
+deps =
+  pre-commit
 commands =
   pre-commit run -a
-  # Run security linter
-  bandit -r oslo_vmware
-
-[testenv:bandit]
-commands = bandit -r oslo_vmware
 
 [testenv:docs]
 allowlist_externals =