Merge branch 'setupcfg' into 'master'

Test suite fixes

https://github.com/pytest-dev/pytest/issues/567

See merge request !123

MANIFEST.in

@@ -1,6 +1,7 @@
 include *.rst
 include CONTRIBUTORS.txt
 include LICENSE
+include *.ini
 global-exclude *.pyc
 recursive-include docs *.rst *.py
 recursive-include tests *.py *.ini *.rst *_diff

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+norecursedirs = .git .* *.egg* old docs dist build
+addopts = -rw

setup.cfg

@@ -11,7 +11,3 @@ requires-dist =
     pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0
     pycodestyle >= 2.0.0, < 2.1.0
     mccabe >= 0.5.0, < 0.6.0
-
-[pytest]
-norecursedirs = .git .* *.egg* old docs dist build
-addopts = -rw