refactor: lint duplications in tox and pre-commit

Liora Milbaum · Liora Milbaum · commit bf2e00d8e7a4 · 2022-10-17T07:46:40.000+03:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -48,3 +48,9 @@ repos:
     rev: 32.238.4
     hooks:
       - id: renovate-config-validator
+  - repo: https://github.com/commitizen-tools/commitizen
+    rev: v2.35.0
+    hooks:
+      - id: commitizen
+      - id: commitizen-branch
+        args: ["--rev-range", "65ecadc..HEAD"]
diff --git a/requirements-lint.txt b/requirements-lint.txt
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 minversion = 1.6
 skipsdist = True
 skip_missing_interpreters = True
-envlist = py310,py39,py38,py37,flake8,black,twine-check,mypy,isort,cz,pylint
+envlist = py310,py39,py38,py37,twine-check
 
 [testenv]
 passenv =
@@ -26,48 +26,6 @@ deps = -r{toxinidir}/requirements.txt
 commands =
   pytest tests/unit tests/meta {posargs}
 
-[testenv:black]
-basepython = python3
-envdir={toxworkdir}/lint
-deps = -r{toxinidir}/requirements-lint.txt
-commands =
-  black {posargs} .
-
-[testenv:isort]
-basepython = python3
-envdir={toxworkdir}/lint
-deps = -r{toxinidir}/requirements-lint.txt
-commands =
-  isort {posargs} {toxinidir}
-
-[testenv:mypy]
-basepython = python3
-envdir={toxworkdir}/lint
-deps = -r{toxinidir}/requirements-lint.txt
-commands =
-  mypy {posargs}
-
-[testenv:flake8]
-basepython = python3
-envdir={toxworkdir}/lint
-deps = -r{toxinidir}/requirements-lint.txt
-commands =
-  flake8 {posargs} .
-
-[testenv:pylint]
-basepython = python3
-envdir={toxworkdir}/lint
-deps = -r{toxinidir}/requirements-lint.txt
-commands =
-  pylint {posargs} gitlab/
-
-[testenv:cz]
-basepython = python3
-envdir={toxworkdir}/lint
-deps = -r{toxinidir}/requirements-lint.txt
-commands =
-  cz check --rev-range 65ecadc..HEAD  # cz is fast, check from first valid commit
-
 [testenv:twine-check]
 basepython = python3
 deps = -r{toxinidir}/requirements.txt
@@ -79,17 +37,6 @@ commands =
 [testenv:venv]
 commands = {posargs}
 
-[flake8]
-exclude = .git,.venv,.tox,dist,doc,*egg,build,
-max-line-length = 88
-# We ignore the following because we use black to handle code-formatting
-# E203: Whitespace before ':'
-# E501: Line too long
-# W503: Line break occurred before a binary operator
-ignore = E203,E501,W503
-per-file-ignores =
-    gitlab/v4/objects/__init__.py:F401,F403
-
 [testenv:docs]
 deps = -r{toxinidir}/requirements-docs.txt
 commands = sphinx-build -n -W --keep-going -b html docs build/sphinx/html
