apply most other hooks and opt out of black reformating

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
-
+exclude: doc/en/example/py2py3/test_py2.py
 repos:
 -   repo: https://github.com/ambv/black
     rev: 18.4a4
     hooks:
     - id: black
-      args: [--safe, --quiet]
+      args: [--safe, --quiet, --check]
       python_version: python3.6
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v1.2.3

doc/en/announce/release-2.4.0.rst

@@ -23,7 +23,7 @@ a full list of details.  A few feature highlights:
   called if the corresponding setup method succeeded.
 
 - integrate tab-completion on command line options if you
-  have `argcomplete <https://pypi.org/project/argcomplete/>`_ 
+  have `argcomplete <http://pypi.python.org/pypi/argcomplete>`_ 
   configured.
 
 - allow boolean expression directly with skipif/xfail

doc/en/fixture.rst

@@ -154,7 +154,7 @@ This makes use of the automatic caching mechanisms of pytest.
 Another good approach is by adding the data files in the ``tests`` folder.
 There are also community plugins available to help managing this aspect of
 testing, e.g. `pytest-datadir <https://github.com/gabrielcnr/pytest-datadir>`__
-and `pytest-datafiles <https://pypi.org/project/pytest-datafiles/>`__. 
+and `pytest-datafiles <https://pypi.python.org/pypi/pytest-datafiles>`__. 
 
 .. _smtpshared:
 

doc/en/genapi.py

@@ -1,6 +1,8 @@
+from __future__ import print_function
 import textwrap
 import inspect
 
+
 class Writer(object):
     def __init__(self, clsname):
         self.clsname = clsname
@@ -11,7 +13,7 @@ class Writer(object):
 
     def __exit__(self, *args):
         self.file.close()
-        print "wrote", self.file.name
+        print("wrote", self.file.name)
 
     def line(self, line):
         self.file.write(line + "\n")
@@ -30,6 +32,7 @@ class Writer(object):
         self.line(w.fill(doc))
         self.line("")
 
+
 def pytest_funcarg__a(request):
     with Writer("request") as writer:
         writer.docmethod(request.getfixturevalue)
@@ -37,5 +40,6 @@ def pytest_funcarg__a(request):
         writer.docmethod(request.addfinalizer)
         writer.docmethod(request.applymarker)
 
+
 def test_hello(a):
     pass

doc/en/test/config.html

@@ -15,4 +15,3 @@ pageTracker._trackPageview();
 } catch(err) {}</script>
 </body>
 </html>
-    

doc/en/test/dist.html

@@ -15,4 +15,3 @@ pageTracker._trackPageview();
 } catch(err) {}</script>
 </body>
 </html>
-    

doc/en/test/extend.html

@@ -15,4 +15,3 @@ pageTracker._trackPageview();
 } catch(err) {}</script>
 </body>
 </html>
-    

doc/en/test/test.html

@@ -15,4 +15,3 @@ pageTracker._trackPageview();
 } catch(err) {}</script>
 </body>
 </html>
-