Merge branch 'pytest330'

Author: RKrahl

CHANGES

@@ -44,6 +44,8 @@
  + Issue #13: Do not import pytest in setup.py to make it compatible
    with pipenv.
 
+ + Issue #15: tests fail with pytest 3.3.0.
+
 * Version 0.2 (2017-05-28)
 
 ** New features

tests/conftest.py

@@ -5,6 +5,10 @@
 
 @pytest.fixture
 def ctestdir(testdir):
+    testdir.makefile('.ini', pytest="""
+        [pytest]
+        console_output_style = classic
+    """)
     testdir.makeconftest("""
         import sys
         if "pytest_dependency" not in sys.modules: