[Python-modules-commits] [python-django-extra-views] 04/11: 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 f83e35de9b7cd362b5818ec4306c988ab98206bb
Merge: e44a8e5 7d0857b
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Mar 16 10:55:32 2017 +0100

    merge patched into master

 .travis.yml                                                    |  6 +-----
 CHANGELOG.rst                                                  |  7 +++++++
 debian/.git-dpm                                                |  6 +++---
 .../0001-Add-template-backend-configuration-for-tests.patch    |  6 +++---
 extra_views/formsets.py                                        | 10 ++++++----
 runtests.py                                                    |  4 ++++
 setup.py                                                       |  2 +-
 tox.ini                                                        |  8 ++++----
 8 files changed, 29 insertions(+), 20 deletions(-)

diff --cc debian/.git-dpm
index a713414,0000000..8351848
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
- f1bfa9241960bf370f131c3555dd11d0e8c75281
- f1bfa9241960bf370f131c3555dd11d0e8c75281
- b2ae89dbaaa16e0e35f979bda9978fddd53e8b01
++7d0857b180d16c96bacb45f1f5956a7e8ab4c51e
++7d0857b180d16c96bacb45f1f5956a7e8ab4c51e
++bf9f58450cc0a79d5d76cd24eba7fc6d72815255
 +bf9f58450cc0a79d5d76cd24eba7fc6d72815255
 +python-django-extra-views_0.9.0.orig.tar.gz
 +838d610f7e590c64ae9bce619332e400da97cbc2
 +25744
diff --cc debian/patches/0001-Add-template-backend-configuration-for-tests.patch
index 3e1da9b,0000000..48024f2
mode 100644,000000..100644
--- a/debian/patches/0001-Add-template-backend-configuration-for-tests.patch
+++ b/debian/patches/0001-Add-template-backend-configuration-for-tests.patch
@@@ -1,28 -1,0 +1,28 @@@
- From f1bfa9241960bf370f131c3555dd11d0e8c75281 Mon Sep 17 00:00:00 2001
++From 7d0857b180d16c96bacb45f1f5956a7e8ab4c51e 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
++index c92e4f0..a78e1fd 100755
 +--- a/runtests.py
 ++++ b/runtests.py
- @@ -19,7 +19,13 @@ def configure(nose_args=None):
++@@ -23,7 +23,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,
 ++                }
 ++            ]
 +         )
 + 
 + 

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