[Python-modules-commits] [django-sekizai] 04/05: merge patched into master

[Michael Fladischer]

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

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

commit 8739dde457d3d08c004ce6a9102ff0356254db1f
Merge: adf8642 7674f03
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Dec 19 20:01:19 2015 +0100

    merge patched into master

 .travis.yml                           | 19 +++++++++++-
 README.rst                            |  3 +-
 debian/.git-dpm                       |  6 ++--
 debian/patches/django-1.7.patch       |  2 +-
 docs/index.rst                        | 29 ++++++++++++++----
 sekizai/__init__.py                   |  2 +-
 sekizai/context_processors.py         |  6 ++--
 sekizai/context_processors.pyi        |  8 +++++
 sekizai/data.py                       | 58 +++++++++++++++++------------------
 sekizai/helpers.py                    | 22 +++++++------
 sekizai/helpers.pyi                   | 29 ++++++++++++++++++
 sekizai/templatetags/sekizai_tags.py  | 16 ++++++----
 sekizai/templatetags/sekizai_tags.pyi |  8 +++++
 sekizai/tests.py                      | 13 ++++++++
 setup.py                              | 33 ++++++++++++--------
 15 files changed, 181 insertions(+), 73 deletions(-)

diff --cc debian/.git-dpm
index 5aa2378,0000000..1a6ca13
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
- 909da8a31dccc41ac524c914d314c0f475442de4
- 909da8a31dccc41ac524c914d314c0f475442de4
- 46f2315138e8f2301520b9baf27eaedd0fa2cfba
++7674f033153d0c2861ba186e8ab546b26214e498
++7674f033153d0c2861ba186e8ab546b26214e498
++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/django-1.7.patch
index 9c5a2f7,0000000..36238b4
mode 100644,000000..100644
--- a/debian/patches/django-1.7.patch
+++ b/debian/patches/django-1.7.patch
@@@ -1,46 -1,0 +1,46 @@@
- From 909da8a31dccc41ac524c914d314c0f475442de4 Mon Sep 17 00:00:00 2001
++From 7674f033153d0c2861ba186e8ab546b26214e498 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:56:53 -0700
 +Subject: Initialize Django before tests are run.
 +
 + Django 1.7 introduced changes to its start-up sequence. See:
 + https://docs.djangoproject.com/en/dev/releases/1.7/#standalone-scripts
 +Last-Update: 2014-09-01
 +Forwarded: https://github.com/ojii/django-sekizai/pull/39
 +
 +Patch-Name: django-1.7.patch
 +---
 + runtests.py | 6 +++++-
 + 1 file changed, 5 insertions(+), 1 deletion(-)
 +
 +diff --git a/runtests.py b/runtests.py
 +index cc3500e..d7f94b3 100644
 +--- a/runtests.py
 ++++ b/runtests.py
 +@@ -1,6 +1,7 @@
 + # -*- coding: utf-8 -*-
 + import os
 + import sys
 ++import django
 + 
 + urlpatterns = []
 + 
 +@@ -25,7 +26,7 @@ TEMPLATE_DIRS = [
 + TEMPLATE_CONTEXT_PROCESSORS = [
 +     'sekizai.context_processors.sekizai',
 + ]
 +-    
 ++
 + 
 + ROOT_URLCONF = 'runtests'
 + 
 +@@ -55,6 +56,9 @@ def runtests():
 +     from django.test.utils import get_runner
 +     TestRunner = get_runner(settings)
 + 
 ++    if django.VERSION >= (1, 7):
 ++        django.setup()
 ++
 +     test_runner = TestRunner(verbosity=1, interactive=False, failfast=False)
 +     failures = test_runner.run_tests(INSTALLED_APPS)
 +     return failures

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