FIX: Use conftest.py instead of __version__.py

CHANGES.rst

@@ -8,6 +8,7 @@ Version 2.2, 2015-??-??
 - Allow recursive inclusion of data files in setup.cfg, issue #49
 - Replaced hand-written PyTest runner by `pytest-runner <https://pypi.python.org/pypi/pytest-runner>`_, issue #47
 - Improved default README.rst, issue #51
+- Use tests/conftes.py instead of tests/__init__.py, issue #52
 
 Version 2.1, 2015-04-16
 =======================

pyscaffold/data/conftest_py.template

@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    Dummy conftest.py for ${package}.
+
+    If you don't know what this is for, just leave it empty.
+    Read more about conftest.py under:
+    https://pytest.org/latest/plugins.html
+"""
+from __future__ import print_function, absolute_import, division
+
+import pytest

pyscaffold/structure.py

@@ -84,7 +84,7 @@ def make_structure(args):
         args.package: {"__init__.py": templates.init(args),
                        "skeleton.py": templates.skeleton(args),
                        "_version.py": templates.version(args)},
-        "tests": {"conftest.py": ""},
+        "tests": {"conftest.py": templates.conftest_py(args)},
         "docs": {"conf.py": templates.sphinx_conf(args),
                  "authors.rst": templates.sphinx_authors(args),
                  "index.rst": templates.sphinx_index(args),
@@ -131,7 +131,8 @@ def make_structure(args):
             "tox.ini": None,
             args.package: {"__init__.py": None,
                            "skeleton.py": None},
-            "tests": {"travis_install.sh": None},
+            "tests": {"conftest.py": None,
+                      "travis_install.sh": None},
             "docs": {"index.rst": None}
         }}
         safe = check_files_exist(safe)

pyscaffold/templates.py

@@ -332,3 +332,14 @@ def changes(args):
     """
     template = get_template("changes")
     return template.substitute(vars(args))
+
+
+def conftest_py(args):
+    """
+    Template of conftest.py
+
+    :param args: command line parameters as :obj:`argparse.Namespace`
+    :return: file content as string
+    """
+    template = get_template("conftest_py")
+    return template.substitute(vars(args))