[Python-modules-commits] [willow] 12/18: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository willow.

commit 813fe60d818fbf194c2dfd46c271737a35713b16
Merge: 2a3c4b7 025c398
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sun Jan 29 16:03:15 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ubject-Adjust-orientation-test-tollerance.patch | 28 ++++++++++++++++------
 tests/test_pillow.py                               |  2 +-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index 2e65c12,0000000..8d98438
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
- 752ca65aec94e29840ac550baa42fa0ff921b40b
- 752ca65aec94e29840ac550baa42fa0ff921b40b
++025c398cb5131e6c14f0a17e0bd27b1e2c7d32a7
++025c398cb5131e6c14f0a17e0bd27b1e2c7d32a7
 +234b203334d3941028c32277ece7caf10adb47a0
 +234b203334d3941028c32277ece7caf10adb47a0
 +willow_0.3.1+dfsg.orig.tar.gz
 +bd0ad5e862265dbc5bc6c8ba20d1b699a5c3b979
 +1607830
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Subject-Adjust-orientation-test-tollerance.patch
index b9b23ac,0000000..6ac6abe
mode 100644,000000..100644
--- a/debian/patches/0002-Subject-Adjust-orientation-test-tollerance.patch
+++ b/debian/patches/0002-Subject-Adjust-orientation-test-tollerance.patch
@@@ -1,27 -1,0 +1,41 @@@
- From 752ca65aec94e29840ac550baa42fa0ff921b40b Mon Sep 17 00:00:00 2001
++From 025c398cb5131e6c14f0a17e0bd27b1e2c7d32a7 Mon Sep 17 00:00:00 2001
 +From: Christopher Hoskin <mans0954 at debian.org>
 +Date: Sun, 29 Jan 2017 15:46:40 +0000
- Subject: Adjust orientation test tollerance
-  Required as repack.sh modifies images
++Subject: =?UTF-8?q?Subject:=20Adjust=20orientation=20test=20tollerance=0A?=
++ =?UTF-8?q?=20Required=20as=20repack.sh=20modifies=20images?=
++
 +Bug: https://github.com/wagtail/Willow/issues/46
 +Forwarded: https://github.com/wagtail/Willow/pull/50
 +Author: Christopher Hoskin <mans0954 at debian.org>
- Last-Update: 202017-01-29
- 
++Last-Update: 2017-01-29
 +---
-  tests/test_wand.py | 2 +-
-  1 file changed, 1 insertion(+), 1 deletion(-)
++ tests/test_pillow.py | 2 +-
++ tests/test_wand.py   | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
 +
++diff --git a/tests/test_pillow.py b/tests/test_pillow.py
++index 7376edb..273c74a 100644
++--- a/tests/test_pillow.py
+++++ b/tests/test_pillow.py
++@@ -144,7 +144,7 @@ class TestPillowImageOrientation(unittest.TestCase):
++         # Check that the red flower is in the bottom left
++         # The JPEGs have compressed slightly differently so the colours won't be spot on
++         colour = image.image.convert('RGB').getpixel((155, 282))
++-        self.assertAlmostEqual(colour[0], 217, delta=10)
+++        self.assertAlmostEqual(colour[0], 217, delta=12)
++         self.assertAlmostEqual(colour[1], 38, delta=11)
++         self.assertAlmostEqual(colour[2], 46, delta=13)
++ 
 +diff --git a/tests/test_wand.py b/tests/test_wand.py
 +index 6104019..5dafbf5 100644
 +--- a/tests/test_wand.py
 ++++ b/tests/test_wand.py
 +@@ -111,7 +111,7 @@ class TestWandImageOrientation(unittest.TestCase):
 +         # Check that the red flower is in the bottom left
 +         # The JPEGs have compressed slightly differently so the colours won't be spot on
 +         colour = image.image[282][155]
 +-        self.assertAlmostEqual(colour.red * 255, 217, delta=10)
 ++        self.assertAlmostEqual(colour.red * 255, 217, delta=12)
 +         self.assertAlmostEqual(colour.green * 255, 38, delta=11)
 +         self.assertAlmostEqual(colour.blue * 255, 46, delta=13)
 + 

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