add pre-commit hooks

beliaev-maksim · csernazs · commit 41b088d9f6f6 · 2022-07-12T11:13:30.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,9 +16,12 @@ jobs:
     - name: Bootstrap environment
       run: |
         make dev EXTRAS=test
+    - name: Style
+      run: |
+        make precommit
     - name: Lint
       run: |
-        make cs mypy
+        make mypy
 
   test:
     name: Test with python ${{ matrix.python-version }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,36 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 22.3.0
+    hooks:
+    - id: black
+      args: [--line-length=120, --safe]
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+    - id: check-case-conflict
+    - id: check-merge-conflict
+    - id: check-symlinks
+    - id: end-of-file-fixer
+    - id: trailing-whitespace
+    - id: debug-statements
+    - id: requirements-txt-fixer
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        name: isort (python)
+        args: ['--force-single-line-imports', '--profile', 'black']
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
+        args: [ '--max-line-length', '120', '--max-doc-length', '120' ]
+
+  - repo: https://github.com/asottile/blacken-docs
+    rev: v1.12.1
+    hooks:
+      - id: blacken-docs
+        additional_dependencies: [ black ]
diff --git a/Makefile b/Makefile
@@ -13,9 +13,9 @@ venv: .venv/.st-venv-completed
 .PHONY: dev
 dev: venv
 
-.PHONY: cs
-cs: venv
-	.venv/bin/flake8 pytest_httpserver tests
+.PHONY: precommit
+precommit: venv
+	pre-commit run -a -v
 
 .PHONY: mypy
 mypy: venv
diff --git a/pyproject.toml b/pyproject.toml
@@ -53,7 +53,6 @@ types-requests = { version = "*", optional = true }
 
 [tool.poetry.extras]
 dev = [
-    "flake8",
     "pytest",
     "pytest-cov",
     "coverage",
@@ -62,9 +61,9 @@ dev = [
     "sphinx",
     "sphinx_rtd_theme",
     "reno",
-    "autopep8",
     "mypy",
     "types-requests",
+    "pre-commit",
 ]
 
 test = [
@@ -75,6 +74,7 @@ test = [
     "requests",
     "mypy",
     "types-requests",
+    "pre-commit",
 ]
 
 doc = [
