Merge branch 'master' into fix-95

zopefoundation · Jan 25, 2018 · 4dcf516 · 4dcf516
2 parents 5c4c7f9 + 807b129
commit 4dcf516
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/buildout.cfg b/buildout.cfg
@@ -2,7 +2,6 @@
 develop = .
 parts =
     code-analysis
-    githook
     interpreter
     test
     pytest
@@ -52,12 +51,5 @@ flake8 = False
 flake8-exclude = bootstrap.py,bootstrap-buildout.py,docs,*.egg.,omelette
 flake8-max-complexity = 15
 
-[githook]
-recipe = plone.recipe.command
-command =
-    #echo "\nbin/pytest" >> .git/hooks/pre-commit
-    echo "\nbin/tox" >> .git/hooks/pre-commit
-    cat .git/hooks/pre-commit
-
 [versions]
 pycodestyle = 2.2.0
diff --git a/tox.ini b/tox.ini
@@ -102,7 +102,6 @@ deps =
     flake8-coding
     flake8-debugger
     flake8-deprecated
-    flake8-print
     flake8-pytest
     flake8-todo
     flake8-isort