fix: django_includes is not required anymore

django-zero · Feb 2, 2021 · 9c83538 · 9c83538
1 parent 337c26b
commit 9c83538
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# Generated by Medikit 0.8.0 on 2021-02-01.
+# Generated by Medikit 0.8.0 on 2021-02-02.
 # All changes will be overriden.
 # Edit Projectfile and run “make update” (or “medikit update”) to regenerate.
 

diff --git a/django_zero/jinja2.py b/django_zero/jinja2.py
@@ -5,7 +5,6 @@
 from django.urls import reverse
 from django.utils.encoding import force_text
 from django.utils.translation import gettext
-from django_includes.jinja2 import DjangoIncludesExtension
 from jinja2 import Environment, lexer, nodes
 from jinja2.ext import Extension
 
@@ -169,7 +168,12 @@ def environment(**options):
         )
 
     env.add_extension(DjangoCsrfExtension)
-    env.add_extension(DjangoIncludesExtension)
+    try:
+        from django_includes.jinja2 import DjangoIncludesExtension
+
+        env.add_extension(DjangoIncludesExtension)
+    except ImportError:
+        pass
     env.add_extension(DjangoUrlExtension)
     env.add_extension(SpacelessExtension)
 

diff --git a/requirements-celery.txt b/requirements-celery.txt
@@ -11,7 +11,7 @@ click==7.1.2
 django-celery-beat==2.2.0
 django-celery-results==2.0.1
 django-timezone-field==4.1.1
-django==3.1.5
+django==3.1.6
 kombu==5.0.2
 prompt-toolkit==3.0.14
 python-crontab==2.5.1

diff --git a/requirements-channels.txt b/requirements-channels.txt
@@ -9,7 +9,7 @@ channels==3.0.3
 constantly==15.1.0
 cryptography==3.3.1
 daphne==3.0.1
-django==3.1.5
+django==3.1.6
 hyperlink==21.0.0
 idna==3.1
 incremental==17.5.0

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -13,7 +13,7 @@ coverage==5.4
 cssselect==1.1.0
 django-debug-toolbar==3.2
 django-extensions==3.1.0
-django==3.1.5
+django==3.1.6
 git-semver==0.3.2
 gitdb==4.0.5
 gitpython==3.1.12

diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ colorama==0.4.4
 cryptography==3.3.1
 defusedxml==0.6.0
 django-allauth==0.44.0
-django==3.1.5
+django==3.1.6
 idna==2.10
 jinja2==2.11.3
 markupsafe==1.1.1

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-# Generated by Medikit 0.8.0 on 2021-02-01.
+# Generated by Medikit 0.8.0 on 2021-02-02.
 # All changes will be overriden.
 # Edit Projectfile and run “make update” (or “medikit update”) to regenerate.
 
@@ -62,11 +62,7 @@ def execfile(fname, globs, locs=None):
         "whitenoise ~= 5.2.0",
     ],
     extras_require={
-        "celery": [
-            "celery ~= 5.0",
-            "django_celery_beat ~= 2.2.0",
-            "django_celery_results ~= 2.0.0",
-        ],
+        "celery": ["celery ~= 5.0", "django_celery_beat ~= 2.2.0", "django_celery_results ~= 2.0.0"],
         "channels": ["channels ~= 3.0.0", "daphne ~= 3.0.0"],
         "dev": [
             "cookiecutter ~= 1.7",