Add pre-commit checks

2017-03-22 08:11:16 -05:00 · 2017-03-22 08:11:16 -05:00 · 11b982ea40
parent a0600b5ba4
commit 11b982ea40
2 changed files with 11 additions and 2 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -0,0 +1,8 @@
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    sha: e626cd57090d8df0be21e4df0f4e55cc3511d6ab
+    hooks:
+    -   id: trailing-whitespace
+    -   id: flake8
+        args:
+        - --max-line-length=160
+    -   id: check-merge-conflict
--- a/requirements.txt
+++ b/requirements.txt
@ -1,7 +1,8 @@
+bumpversion
+pre-commit
 pytest
-tox
 pytest-cov
 sphinx
-bumpversion
+tox

 -e .