Merge branch 'issue-104-autorun-2to3' into 'development'

Resolved issue #104.

pystache/tests/test_doctests.py

@@ -55,9 +55,11 @@ def load_tests(loader=None, tests=None, ignore=None):
     #   http://docs.python.org/library/doctest.html#doctest.DocFileSuite
     #
     paths = [os.path.join(PROJECT_DIR, path) for path in text_file_paths]
-    tests.addTests(doctest.DocFileSuite(*paths, module_relative=False))
+    for path in paths:
+        suite = doctest.DocFileSuite(path, module_relative=False)
+        tests.addTests(suite)
 
-    modules = get_module_doctests()
+    modules = _get_module_doctests()
     for module in modules:
         suite = doctest.DocTestSuite(module)
         tests.addTests(suite)
@@ -65,7 +67,7 @@ def load_tests(loader=None, tests=None, ignore=None):
     return tests
 
 
-def get_module_doctests():
+def _get_module_doctests():
     modules = []
 
     for pkg in pkgutil.walk_packages([SOURCE_DIR]):

setup.py

@@ -40,7 +40,7 @@ import sys
 
 
 try:
-    from setuptools import setup
+    from setuptools import setup, find_packages
 except ImportError:
     from distutils.core import setup
 
@@ -68,17 +68,40 @@ if sys.argv[-1] == 'publish':
     sys.exit()
 
 long_description = make_long_description()
+template_files = ['*.mustache', '*.txt']
+
+# We follow the suggestion here for compatibility with earlier versions
+# of Python:
+#
+#   http://packages.python.org/distribute/python3.html#note-on-compatibility-with-setuptools
+#
+if sys.version_info < (3, ):
+    extra = {}
+else:
+    # For testing purposes, we also use use_2to3 with Python 2.7.  This
+    # lets us troubleshoot the absence of package resources in the build
+    # directory more easily (e.g. the absence of README.rst), since we can
+    # troubleshoot it while using Python 2.7 instead of Python 3.
+    extra = {
+        'use_2to3': True,
+    }
 
 setup(name='pystache',
       version='0.5.0-rc',
+      license='MIT',
       description='Mustache for Python',
       long_description=long_description,
       author='Chris Wanstrath',
       author_email='chris@ozmm.org',
       maintainer='Chris Jerdonek',
       url='http://github.com/defunkt/pystache',
-      packages=['pystache'],
-      license='MIT',
+      packages=find_packages(),
+      package_data = {
+          # Include template files so tests can be run.
+          'examples': template_files,
+          'pystache.tests.data': template_files,
+          'pystache.tests.data.locator': template_files,
+      },
       test_suite='pystache.tests',
       entry_points = {
         'console_scripts': ['pystache=pystache.commands:main'],
@@ -91,5 +114,6 @@ setup(name='pystache',
         'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
-      )
+      ),
+      **extra
 )