[Python-modules-commits] [python-django-extra-views] 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 python-django-extra-views.

commit 1aeb809550f3b11065deb6116130b1eb84bcc705
Merge: 3d42230 f1bfa92
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Mar 1 21:02:58 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-template-backend-configuration-for-tests.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 runtests.py                                        |  8 ++++++-
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 45e0fce,0000000..3cb7e04
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- b2ae89dbaaa16e0e35f979bda9978fddd53e8b01
- b2ae89dbaaa16e0e35f979bda9978fddd53e8b01
++f1bfa9241960bf370f131c3555dd11d0e8c75281
++f1bfa9241960bf370f131c3555dd11d0e8c75281
 +b2ae89dbaaa16e0e35f979bda9978fddd53e8b01
 +b2ae89dbaaa16e0e35f979bda9978fddd53e8b01
 +python-django-extra-views_0.8.0.orig.tar.gz
 +adb0cc5da50b9013f1fb9c67c073611cbc9e258c
 +25663
diff --cc debian/patches/0001-Add-template-backend-configuration-for-tests.patch
index 0000000,0000000..3e1da9b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-template-backend-configuration-for-tests.patch
@@@ -1,0 -1,0 +1,28 @@@
++From f1bfa9241960bf370f131c3555dd11d0e8c75281 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 1 Mar 2017 21:02:35 +0100
++Subject: Add template backend configuration for tests.
++
++---
++ runtests.py | 8 +++++++-
++ 1 file changed, 7 insertions(+), 1 deletion(-)
++
++diff --git a/runtests.py b/runtests.py
++index 0dfbe0d..5ddaa55 100755
++--- a/runtests.py
+++++ b/runtests.py
++@@ -19,7 +19,13 @@ def configure(nose_args=None):
++                 'extra_views_tests',
++             ],
++             ROOT_URLCONF='extra_views_tests.urls',
++-            NOSE_ARGS=nose_args
+++            NOSE_ARGS=nose_args,
+++            TEMPLATES=[
+++                {
+++                    'BACKEND': 'django.template.backends.django.DjangoTemplates',
+++                    'APP_DIRS': True,
+++                }
+++            ]
++         )
++ 
++ 
diff --cc debian/patches/series
index 0000000,0000000..6fcdb0b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-template-backend-configuration-for-tests.patch

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