Bug#861344: unblock: sorl-thumbnail/12.3+git20160928-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package sorl-thumbnail
Reverted change from previous version: wand support removed,
because tests crashed on i386.
Also disabled two tests which accessed a third-party server
during build.
And finally Multi-Arch to "foreign" for the -doc package.
diff -Nru sorl-thumbnail-12.3+git20160928/debian/changelog sorl-thumbnail-12.3+git20160928/debian/changelog
--- sorl-thumbnail-12.3+git20160928/debian/changelog 2016-10-05 03:23:42.000000000 +0200
+++ sorl-thumbnail-12.3+git20160928/debian/changelog 2017-04-27 00:10:48.000000000 +0200
@@ -1,3 +1,13 @@
+sorl-thumbnail (12.3+git20160928-2) unstable; urgency=medium
+
+ * Disable support for Wand again, because tests crash on i386
+ (Closes: #860668).
+ * Update patch to disable HTTP requests during tests
+ (Closes: #857707).
+ * Mark python-sorl-thumbnail-doc as Multi-Arch: foreign.
+
+ -- W. Martin Borgert <debacle@debian.org> Wed, 26 Apr 2017 22:10:48 +0000
+
sorl-thumbnail (12.3+git20160928-1) unstable; urgency=medium
* New upstream git snapshot (Closes: #834678).
diff -Nru sorl-thumbnail-12.3+git20160928/debian/control sorl-thumbnail-12.3+git20160928/debian/control
--- sorl-thumbnail-12.3+git20160928/debian/control 2016-10-05 03:23:42.000000000 +0200
+++ sorl-thumbnail-12.3+git20160928/debian/control 2017-04-27 00:10:48.000000000 +0200
@@ -16,14 +16,12 @@
python-pytest,
python-pytest-django,
python-setuptools,
- python-wand,
python3-all,
python3-django,
python3-pil,
python3-pytest,
python3-pytest-django,
python3-setuptools,
- python3-wand,
python-sphinx (>= 1.0.7+dfsg)
Build-Conflicts: locales-all (<< 2.21-1)
Standards-Version: 3.9.8
@@ -36,7 +34,7 @@
Package: python-sorl-thumbnail
Architecture: all
Depends: python-django,
- python-pil | python-pgmagick | imagemagick | graphicsmagick | python-wand,
+ python-pil | python-pgmagick | imagemagick | graphicsmagick,
${misc:Depends},
${python:Depends}
Suggests: python-redis
@@ -61,7 +59,7 @@
Package: python3-sorl-thumbnail
Architecture: all
Depends: python3-django,
- python3-pil | imagemagick | graphicsmagick | python3-wand,
+ python3-pil | imagemagick | graphicsmagick,
${misc:Depends},
${python3:Depends}
Suggests: python3-redis
@@ -87,6 +85,7 @@
Package: python-sorl-thumbnail-doc
Section: doc
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends},
${sphinxdoc:Depends}
Description: thumbnail support for the Django framework (Documentation)
diff -Nru sorl-thumbnail-12.3+git20160928/debian/patches/disable_http_tests.patch sorl-thumbnail-12.3+git20160928/debian/patches/disable_http_tests.patch
--- sorl-thumbnail-12.3+git20160928/debian/patches/disable_http_tests.patch 2016-10-05 02:59:29.000000000 +0200
+++ sorl-thumbnail-12.3+git20160928/debian/patches/disable_http_tests.patch 2017-04-27 00:10:48.000000000 +0200
@@ -1,6 +1,7 @@
From 8d83ae645900b535160dbe3becc7c0cc651b13cd Mon Sep 17 00:00:00 2001
From: Michael Fladischer <FladischerMichael@fladi.at>
Date: Thu, 8 Oct 2015 13:53:16 -0700
+Update: 2017-04-26, W. Martin Borgert <debacle@debian.org>
Subject: Disable HTTP requests during build
Remote resources such as images fetched over HTTP are not allowed at build
@@ -15,11 +16,9 @@
tests/thumbnail_tests/test_templatetags.py | 2 ++
2 files changed, 9 insertions(+), 6 deletions(-)
-diff --git a/tests/thumbnail_tests/test_engines.py b/tests/thumbnail_tests/test_engines.py
-index 4ef4617..da6a86a 100644
--- a/tests/thumbnail_tests/test_engines.py
+++ b/tests/thumbnail_tests/test_engines.py
-@@ -192,12 +192,13 @@ class SimpleTestCase(BaseTestCase):
+@@ -192,12 +192,13 @@
default.kvstore.get(im).serialize_storage(),
'tests.thumbnail_tests.storage.TestStorage',
)
@@ -39,8 +38,6 @@
def test_abspath(self):
item = Item.objects.get(image='500x500.jpg')
-diff --git a/tests/thumbnail_tests/test_templatetags.py b/tests/thumbnail_tests/test_templatetags.py
-index c774dea..60de741 100644
--- a/tests/thumbnail_tests/test_templatetags.py
+++ b/tests/thumbnail_tests/test_templatetags.py
@@ -1,6 +1,7 @@
@@ -51,7 +48,7 @@
from subprocess import Popen, PIPE
from PIL import Image
-@@ -113,10 +114,12 @@ class TemplateTestCaseA(BaseTestCase):
+@@ -120,10 +121,12 @@
class TemplateTestCaseB(BaseTestCase):
@@ -64,3 +61,30 @@
def test_portrait(self):
val = render_to_string('thumbnail4.html', {
'source': 'http://dummyimage.com/120x100/',
+--- a/tests/thumbnail_tests/test_filters.py
++++ b/tests/thumbnail_tests/test_filters.py
+@@ -1,4 +1,8 @@
+ # -*- coding: utf-8 -*-
++
++import os
++import unittest
++
+ import pytest
+ from django.template.loader import render_to_string
+
+@@ -9,6 +13,7 @@
+
+
+ class FilterTestCase(BaseTestCase):
++ @unittest.skipIf(os.environ.get('LOCAL_BUILD', False), "No remote resources desired")
+ def test_html_filter(self):
+ text = '<img alt="A image!" src="http://dummyimage.com/800x800"; />'
+ val = render_to_string('htmlfilter.html', {'text': text, }).strip()
+@@ -29,6 +34,7 @@
+ val
+ )
+
++ @unittest.skipIf(os.environ.get('LOCAL_BUILD', False), "No remote resources desired")
+ def test_markdown_filter(self):
+ text = ''
+ val = render_to_string('markdownfilter.html', {'text': text, }).strip()
diff -Nru sorl-thumbnail-12.3+git20160928/debian/rules sorl-thumbnail-12.3+git20160928/debian/rules
--- sorl-thumbnail-12.3+git20160928/debian/rules 2016-10-05 03:18:13.000000000 +0200
+++ sorl-thumbnail-12.3+git20160928/debian/rules 2017-04-27 00:09:38.000000000 +0200
@@ -23,7 +23,7 @@
localedef -i en_US -c -f UTF-8 tmp-locales/en_US.UTF-8
set -e; \
for python in $(shell pyversions -r) $(shell py3versions -r); do \
- for name in pil pgmagick imagemagick graphicsmagick wand; do \
+ for name in pil pgmagick imagemagick graphicsmagick; do \
if [ $$(echo $$python | cut -f 1 -d .)"-$$name" = "python3-pgmagick" ]; then continue; fi; \
LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=. LOCAL_BUILD=1 DJANGO_SETTINGS_MODULE=tests.settings.$$name $$python -m pytest ; \
done; \
unblock sorl-thumbnail/12.3+git20160928-2
Reply to: