Fixed some installation problems spotted by Mika Saaranen.

http://morozov.ca/django-pdf-msword-excel-templates.html#disqus_thread

Author: alexmorozov

.travis.yml

@@ -5,8 +5,10 @@ env:
     LO_VERSION=5.1.1.3
     LO_PATH=/opt/libreoffice5.1/program
   matrix:
-    - TOXENV=py27
-    - TOXENV=py34
+    - TOXENV=py27-django18
+    - TOXENV=py27-django19
+    - TOXENV=py34-django18
+    - TOXENV=py34-django19
     - TOXENV=flake8
 install: pip install -U tox
 before_install:

example/manage.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python
 
 import os
+import os.path
 import sys
 
 if __name__ == "__main__":
-    sys.path.append('..')
+    BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    sys.path.append(BASE_DIR)
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings")
     from django.core.management import execute_from_command_line
     execute_from_command_line(sys.argv)

setup.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 with open('README.rst') as readme_file:
@@ -23,17 +23,13 @@
 setup(
     name='templated_docs',
     version='0.2.7',
-    description=('Templated-docs generates templated documents '
-                 'in any format supported by LibreOffice'),
+    description=('Generate PDF, MS Word and Excel documents from templates '
+                 'in Django.'),
     long_description=readme + '\n\n' + history,
     author="Alex Morozov",
     author_email='alex@morozov.ca',
     url='https://github.com/alexmorozov/templated-docs',
-    packages=[
-        'templated_docs',
-    ],
-    package_dir={'templated_docs':
-                 'templated_docs'},
+    packages=find_packages(),
     include_package_data=True,
     install_requires=requirements,
     license="MIT license",
@@ -44,6 +40,8 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',

templated_docs/__init__.py

@@ -7,7 +7,13 @@
 
 from django.conf import settings
 from django.template import Template
-from django.template.exceptions import TemplateDoesNotExist
+
+try:
+    # Django 1.9+
+    from django.template.exceptions import TemplateDoesNotExist
+except ImportError:
+    from django.template import TemplateDoesNotExist
+
 from django.template import Context, engines
 
 from django.utils.encoding import smart_bytes, smart_str
@@ -63,8 +69,9 @@ def find_template_file(template_name):
     """
     for loader in _get_template_loaders():
         for origin in loader.get_template_sources(template_name, None):
-            if os.path.exists(origin.name):
-                return origin.name
+            path = getattr(origin, 'name', origin)  # Django <1.9 compatibility
+            if os.path.exists(path):
+                return path
     raise TemplateDoesNotExist(template_name)
 
 

tox.ini

@@ -1,10 +1,14 @@
 [tox]
-envlist = py27, py34, flake8
+envlist = py{27,34}-django{18,19}, flake8
 
 [testenv:flake8]
 deps=flake8
 commands=flake8 templated_docs
 
 [testenv]
 passenv = LO_PATH
+deps =
+    django18: Django>=1.8,<1.9
+    django19: Django>=1.9,<1.10
 commands = python tests/manage.py test
+    python example/manage.py check