diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000000000000000000000000000000000000..5558e2d6dcb70028912b3e669447b4d46eda08e4 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +recursive-include uw_django_templates/templates *.html +recursive-include uw_django_templates/static * \ No newline at end of file diff --git a/setup.py b/setup.py index d273fe24ee9cd2667ce2e00df23020600a9ebe4b..b74c35055dacf5c43e69bf1000387d565cd1147c 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ try: - from setuptools import setup + from setuptools import setup, find_packages except ImportError: from distutils.core import setup setup(name='uw_django_templates', @@ -8,11 +8,10 @@ setup(name='uw_django_templates', author='Ryan Goggin', author_email='ryan.goggin@uwaterloo.ca', url='https://ryangoggin.net', - packages=['uw_django_templates'], - package_dir={'uw_django_templates': 'uw_django_templates'}, - package_data={'uw_django_templates': ['templates/*.html', 'static/*']}, + packages=find_packages(), + include_package_data=True, install_requires=[ - 'django-compressor', - 'django-libsass' + 'django-compressor>=2.4', + 'django-libsass>=0.8', ] ) diff --git a/uw_django_templates/templates/uw_django/base.html b/uw_django_templates/templates/uw_django/base.html index b7491f832c9eafe3c4b4a5c0aeb7cd77d2fc75e3..c845dc583aee1a4ae731d8b667c42caa5abc48cc 100755 --- a/uw_django_templates/templates/uw_django/base.html +++ b/uw_django_templates/templates/uw_django/base.html @@ -1,4 +1,4 @@ -{% load static compress helpers %} +{% load static compress uw_django_template_helpers %} diff --git a/uw_django_templates/templates/uw_django/blocks/pagination.html b/uw_django_templates/templates/uw_django/blocks/pagination.html index 281567ca8ee59292c3ad1c37ac7a93e3f9fff4e5..36edda7317fc91234210f13409aaee38cdc52269 100644 --- a/uw_django_templates/templates/uw_django/blocks/pagination.html +++ b/uw_django_templates/templates/uw_django/blocks/pagination.html @@ -1,4 +1,4 @@ -{% load helpers %} +{% load uw_django_template_helpers %}