[Python-modules-commits] [django-pipeline] 02/03: 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-pipeline.

commit 76b3f392f9dda434fa55d82e26605c854b832fe5
Merge: ad1bce9 e6c9304
Author: Thomas Goirand <zigo at debian.org>
Date:   Fri Aug 5 11:31:14 2016 +0000

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...fine-kwarg_name-in-pipeline_settings-class.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 tests/utils.py                                      |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 79e7264,0000000..a2dd8fb
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
- e4b97bb92c2b60eace913fc18e0a23fc44d04b9c
- e4b97bb92c2b60eace913fc18e0a23fc44d04b9c
++e6c9304cf992e554867f46b51baa277aa9c8031d
++e6c9304cf992e554867f46b51baa277aa9c8031d
 +a6e05d2f0d2ddbb4a6554def26c0571761315ab3
 +a6e05d2f0d2ddbb4a6554def26c0571761315ab3
 +django-pipeline_1.6.8.orig.tar.gz
 +2876cf4711198c5454849289db2c12ea40047a81
 +52932
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Define-kwarg_name-in-pipeline_settings-class.patch
index 0000000,0000000..3075c7b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Define-kwarg_name-in-pipeline_settings-class.patch
@@@ -1,0 -1,0 +1,21 @@@
++From e6c9304cf992e554867f46b51baa277aa9c8031d Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Fri, 5 Aug 2016 11:30:38 +0000
++Subject: Define kwarg_name in pipeline_settings class
++
++---
++ tests/utils.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/tests/utils.py b/tests/utils.py
++index bf1c7ca..c3501dc 100644
++--- a/tests/utils.py
+++++ b/tests/utils.py
++@@ -16,6 +16,7 @@ def _(path):
++ 
++ 
++ class pipeline_settings(override_settings):
+++    kwarg_name = None
++     def __init__(self, **kwargs):
++         self.options = {'PIPELINE': kwargs}
++ 
diff --cc debian/patches/series
index 05ec2ff,0000000..bc1306c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Remove-slimit-test.patch
 +0002-Change-default-compressors.patch
++0003-Define-kwarg_name-in-pipeline_settings-class.patch

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