[Python-modules-commits] [django-sekizai] 02/06: merge patched into master

[Thomas Goirand]

This is an automated email from the git hooks/post-receive script.

zigo pushed a commit to branch master
in repository django-sekizai.

commit 241398abe0c476f39f0b4d62fb5227e4d0a52778
Merge: c72e5ea 880b748
Author: Thomas Goirand <zigo at debian.org>
Date:   Tue Aug 2 08:40:37 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...jango-1.10-fix_runtests_lack_of_TEMPLATES.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 runtests.py                                        | 14 ++++++++
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 1a6ca13,0000000..2e7b72b
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 7674f033153d0c2861ba186e8ab546b26214e498
- 7674f033153d0c2861ba186e8ab546b26214e498
++880b74889bbba237fe1bb17d992e1cbbb462be6b
++880b74889bbba237fe1bb17d992e1cbbb462be6b
 +cbe38b705eb5fecef3bfe58b07dbd1e2904d518d
 +cbe38b705eb5fecef3bfe58b07dbd1e2904d518d
 +django-sekizai_0.9.0.orig.tar.gz
 +e678764d638d4c8645d75c567012d0190e184810
 +18569
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-django-1.10-fix_runtests_lack_of_TEMPLATES.patch
index 0000000,0000000..3961532
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-django-1.10-fix_runtests_lack_of_TEMPLATES.patch
@@@ -1,0 -1,0 +1,41 @@@
++From 880b74889bbba237fe1bb17d992e1cbbb462be6b Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Tue, 2 Aug 2016 08:39:49 +0000
++Subject: django-1.10-fix_runtests_lack_of_TEMPLATES
++
++---
++ runtests.py | 14 ++++++++++++++
++ 1 file changed, 14 insertions(+)
++
++diff --git a/runtests.py b/runtests.py
++index d7f94b3..11ddb22 100644
++--- a/runtests.py
+++++ b/runtests.py
++@@ -30,6 +30,19 @@ TEMPLATE_CONTEXT_PROCESSORS = [
++ 
++ ROOT_URLCONF = 'runtests'
++ 
+++TEMPLATES = [
+++    {
+++        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+++        'DIRS': [ os.path.join(os.path.dirname(__file__), 'sekizai', 'test_templates'), ],
+++        'OPTIONS': {
+++            'context_processors': [
+++                'sekizai.context_processors.sekizai',
+++            ],
+++            'debug': True,
+++        },
+++    },
+++]
+++
++ 
++ def runtests():
++     from django import VERSION
++@@ -47,6 +60,7 @@ def runtests():
++         TEMPLATE_CONTEXT_PROCESSORS=TEMPLATE_CONTEXT_PROCESSORS,
++         TEMPLATE_DEBUG=TEMPLATE_DEBUG,
++         MIDDLEWARE_CLASSES=[],
+++        TEMPLATES=TEMPLATES,
++     )
++     if VERSION[1] >= 7:
++         from django import setup
diff --cc debian/patches/series
index 14efb12,0000000..1c46bdd
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +django-1.7.patch
++0002-django-1.10-fix_runtests_lack_of_TEMPLATES.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-sekizai.git