summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Bengtsson <dbengt@redhat.com>2021-03-23 13:12:06 +0100
committerDaniel Bengtsson <dbengt@redhat.com>2021-04-06 11:01:50 +0200
commit714e77e71f69a223e47afd9d129fc50f76ecd1fc (patch)
tree3e63a010a1f13222e09e66d16f7313631bf4f243
parentfa2b6cc7aecd71677ba6c244abc6954aae48cd2a (diff)
downloadtooz-714e77e71f69a223e47afd9d129fc50f76ecd1fc.tar.gz
Move flake8 as a pre-commit local target.
The goal here is to avoid conflicts between flake8 and hacking version each 2 days. Inspired from nova's approach[1]. The flake8 version to install will be determined by hacking and requirements[2] will stay aligned instead of relying on different versions. [1] https://opendev.org/openstack/nova/src/branch/master/.pre-commit-config.yaml#L26-L35 [2] https://opendev.org/openstack/hacking/src/branch/master/requirements.txt#L1 Change-Id: Ic3f3d05ce7bb10a7d29815444dac00dea4f9c9d1
-rw-r--r--.pre-commit-config.yaml10
-rw-r--r--tox.ini2
2 files changed, 8 insertions, 4 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 00a9e83..319697b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ default_language_version:
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: ebc15addedad713c86ef18ae9632c88e187dd0af # v3.1.0
+ rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
hooks:
- id: trailing-whitespace
# Replaces or checks mixed line ending
@@ -27,9 +27,13 @@ repos:
- id: debug-statements
- id: check-yaml
files: .*\.(yaml|yml)$
- - repo: https://gitlab.com/pycqa/flake8
- rev: fb91b994ed4adf4f2b4890e7bdba82f57e3a81df # 3.8.4
+ - repo: local
hooks:
- id: flake8
+ name: flake8
additional_dependencies:
- hacking>=4.0.0,<4.1.0
+ language: python
+ entry: flake8
+ files: '^.*\.py$'
+ exclude: '^(doc|releasenotes|tools)/.*$'
diff --git a/tox.ini b/tox.ini
index 082658f..b0629fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -59,7 +59,7 @@ deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -W -b html doc/source doc/build/html
[testenv:pep8]
-deps = hacking<4.1.0,>=4.0.0
+deps = hacking>=4.0.0,<4.1.0
doc8
pre-commit>=2.6.0
commands =