Merge pull request #1162 from matthiask/mk/djmaster

Replace usage of django-jinja with Django's own Jinja2 backend

Author: matthiask

requirements_dev.txt

@@ -2,7 +2,7 @@
 
 Django
 sqlparse
-django_jinja
+Jinja2
 
 # Testing
 

tests/panels/test_template.py

@@ -96,7 +96,7 @@ class JinjaTemplateTestCase(TestCase):
     def test_django_jinja2(self):
         r = self.client.get("/regular_jinja/foobar/")
         self.assertContains(r, "Test for foobar (Jinja)")
-        self.assertContains(r, "<h3>Templates (1 rendered)</h3>")
+        self.assertContains(r, "<h3>Templates (2 rendered)</h3>")
         self.assertContains(r, "<small>jinja2/basic.jinja</small>")
 
 

tests/settings.py

@@ -24,7 +24,6 @@
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "debug_toolbar",
-    "django_jinja",
     "tests",
 ]
 
@@ -46,7 +45,7 @@
 TEMPLATES = [
     {
         "NAME": "jinja2",
-        "BACKEND": "django_jinja.backend.Jinja2",
+        "BACKEND": "django.template.backends.jinja2.Jinja2",
         "APP_DIRS": True,
         "DIRS": [os.path.join(BASE_DIR, "tests", "templates", "jinja2")],
     },

tox.ini

@@ -19,7 +19,7 @@ deps =
     dj22: Django>=2.2,<3.0
     djmaster: https://github.com/django/django/archive/master.tar.gz
     coverage
-    django_jinja
+    Jinja2
     html5lib
     selenium<4.0
     sqlparse
@@ -33,7 +33,7 @@ commands = make coverage TEST_ARGS='{posargs:tests}'
 deps =
     Django>=2.1,<2.2
     coverage
-    django_jinja
+    Jinja2
     html5lib
     psycopg2-binary
     selenium<4.0
@@ -49,7 +49,7 @@ commands = make coverage TEST_ARGS='{posargs:tests}'
 deps =
     Django>=2.1,<2.2
     coverage
-    django_jinja
+    Jinja2
     html5lib
     mysqlclient<1.4
     selenium<4.0