From b265abeaadb2ac3551eec1b0320720b40a4bc18d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 13 Jan 2025 13:46:08 +0900 Subject: [PATCH] pre-commit: Bump versions hacking now has a native hook. Co-Authored-By: Stephen Finucane Change-Id: I199c5184dc9d52a21c964ccd7f4d17a2c1eb8175 --- .pre-commit-config.yaml | 24 +++++------------------- test-requirements.txt | 2 -- tox.ini | 5 ++++- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9b908c6..d174849 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,8 @@ 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>=6.1.0,<6.2.0 - language: python - entry: flake8 - files: '^.*\.py$' - exclude: '^(doc|releasenotes|tools)/.*$' + - id: hacking + additional_dependencies: [] diff --git a/test-requirements.txt b/test-requirements.txt index 5d2a077..a15fc7a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,3 @@ -hacking>=6.1.0,<6.2.0 # Apache-2.0 oslotest>=3.5.0 stestr>=2.0.0 -pre-commit>=2.6.0 # MIT oslo.serialization>=2.21.1 # Apache-2.0 diff --git a/tox.ini b/tox.ini index e0949f2..288f799 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,10 @@ deps = commands = stestr run --slowest {posargs} [testenv:pep8] -commands = pre-commit run -a +deps = + pre-commit +commands = + pre-commit run -a [testenv:venv] commands = {posargs}