Merge branch 'fix-install' into 'master'

Fix install See merge request uw_django/uw_django_templates!2

Merge branch 'fix-install' into 'master'
Fix install See merge request uw_django/uw_django_templates!2
393a9508 · Ryan Goggin · d98a6d23 · d707015b · 393a9508 · 393a9508
Commit 393a9508 authored Mar 30, 2020 by Ryan Goggin
5 changed files
--- a/MANIFEST.in
+++ b/MANIFEST.in
+recursive-include uw_django_templates/templates *.html
+recursive-include uw_django_templates/static *
\ No newline at end of file
--- a/setup.py
+++ b/setup.py
 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',
    ]
 )
--- a/uw_django_templates/templates/uw_django/base.html
+++ b/uw_django_templates/templates/uw_django/base.html
-{% load static compress helpers %}
+{% load static compress uw_django_template_helpers %}
 <!doctype html>
 <html lang="en">
    <head>

--- a/uw_django_templates/templates/uw_django/blocks/pagination.html
+++ b/uw_django_templates/templates/uw_django/blocks/pagination.html
-{% load helpers %}
+{% load uw_django_template_helpers %}

 <nav aria-label="Page Navigation">
    <ul class="pagination justify-content-center">

--- a/uw_django_templates/templatetags/helpers.py
+++ b/uw_django_templates/templatetags/helpers.py