[Python-modules-commits] [sorl-thumbnail] 16/17: merge patched into master

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository sorl-thumbnail.

commit c1f0e43d20a28e6fa482c78bf75571532d53e763
Merge: 2a2096d 2301172
Author: W. Martin Borgert <debacle at debian.org>
Date:   Wed Jan 6 22:01:07 2016 +0100

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...-skip-incompatible-test-for-Django-1.8-1.9.patch | 21 +++++++++++++++++++--
 tests/thumbnail_tests/compat.py                     |  5 ++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index b880952,0000000..99caeec
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
- e0d51e37a53db15ec009bb8b2c3a431fae8fb313
- e0d51e37a53db15ec009bb8b2c3a431fae8fb313
++2301172c97b1680a811bfa99b6a869217d6785a8
++2301172c97b1680a811bfa99b6a869217d6785a8
 +42b81892242e6ae4979e886c38f92a113aa58721
 +42b81892242e6ae4979e886c38f92a113aa58721
 +sorl-thumbnail_12.3.orig.tar.gz
 +a07ff2cde4c0f1735ed3f53dcf79820ab9f56e65
 +527063
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-skip-incompatible-test-for-Django-1.8-1.9.patch
index 71d2381,0000000..604f23b
mode 100644,000000..100644
--- a/debian/patches/0004-skip-incompatible-test-for-Django-1.8-1.9.patch
+++ b/debian/patches/0004-skip-incompatible-test-for-Django-1.8-1.9.patch
@@@ -1,29 -1,0 +1,46 @@@
- From e0d51e37a53db15ec009bb8b2c3a431fae8fb313 Mon Sep 17 00:00:00 2001
++From 2301172c97b1680a811bfa99b6a869217d6785a8 Mon Sep 17 00:00:00 2001
 +From: "W. Martin Borgert" <debacle at debian.org>
 +Date: Wed, 6 Jan 2016 21:18:12 +0100
 +Subject: skip incompatible test for Django 1.8/1.9
 +
 +---
++ tests/thumbnail_tests/compat.py            | 5 ++++-
 + tests/thumbnail_tests/test_templatetags.py | 2 ++
-  1 file changed, 2 insertions(+)
++ 2 files changed, 6 insertions(+), 1 deletion(-)
 +
++diff --git a/tests/thumbnail_tests/compat.py b/tests/thumbnail_tests/compat.py
++index e1e1fba..21b08ed 100644
++--- a/tests/thumbnail_tests/compat.py
+++++ b/tests/thumbnail_tests/compat.py
++@@ -8,7 +8,10 @@ PY3 = sys.version_info[0] == 3
++ if PY3:
++     import unittest
++ else:
++-    from django.utils import unittest
+++    try:
+++        from django.utils import unittest
+++    except ImportError:
+++        import unittest
++ 
++ 
++ def is_osx():
 +diff --git a/tests/thumbnail_tests/test_templatetags.py b/tests/thumbnail_tests/test_templatetags.py
 +index 0dbef1e..557c2d2 100644
 +--- a/tests/thumbnail_tests/test_templatetags.py
 ++++ b/tests/thumbnail_tests/test_templatetags.py
 +@@ -8,6 +8,7 @@ from PIL import Image
 + 
 + from django.template.loader import render_to_string
 + from django.test import Client, TestCase
 ++from django import VERSION
 + import pytest
 + 
 + from sorl.thumbnail.conf import settings
 +@@ -167,6 +168,7 @@ class TemplateTestCaseB(BaseTestCase):
 + 
 + 
 + class TemplateTestCaseClient(TestCase):
 ++    @unittest.skipIf(VERSION[0] == 1 and VERSION[1] in [8, 9], "Test incompatible with Django 1.8/1.9")
 +     def test_empty_error(self):
 +         with override_custom_settings(settings, THUMBNAIL_DEBUG=False):
 +             from django.core.mail import outbox

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