From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70030138334 for ; Fri, 29 Jun 2018 02:56:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AC8FE07EF; Fri, 29 Jun 2018 02:56:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0261EE07EF for ; Fri, 29 Jun 2018 02:56:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D3D0335C39 for ; Fri, 29 Jun 2018 02:56:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 689CB2E2 for ; Fri, 29 Jun 2018 02:56:44 +0000 (UTC) From: "Virgil Dupras" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Virgil Dupras" Message-ID: <1530240867.7dd0d64be1679025f5cc9c46da39b5b3ed2f8298.vdupras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/, dev-python/pillow/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch dev-python/pillow/pillow-4.3.0-r1.ebuild X-VCS-Directories: dev-python/pillow/ dev-python/pillow/files/ X-VCS-Committer: vdupras X-VCS-Committer-Name: Virgil Dupras X-VCS-Revision: 7dd0d64be1679025f5cc9c46da39b5b3ed2f8298 X-VCS-Branch: master Date: Fri, 29 Jun 2018 02:56:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ea49fd94-50b2-4bb8-b6d1-2ba09a1b82bc X-Archives-Hash: 1374e37b2bda1b3b5e2b7d3d59fc75d5 commit: 7dd0d64be1679025f5cc9c46da39b5b3ed2f8298 Author: Virgil Dupras gentoo org> AuthorDate: Fri Jun 29 02:54:27 2018 +0000 Commit: Virgil Dupras gentoo org> CommitDate: Fri Jun 29 02:54:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd0d64b dev-python/pillow: make all tests pass on 4.3.0 Closes: https://bugs.gentoo.org/593816 Package-Manager: Portage-2.3.41, Repoman-2.3.9 .../pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch | 12 ++++++++++++ dev-python/pillow/pillow-4.3.0-r1.ebuild | 12 +++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch new file mode 100644 index 00000000000..211ef7ac58d --- /dev/null +++ b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch @@ -0,0 +1,12 @@ +--- a/Tests/test_imagefont.py ++++ b/Tests/test_imagefont.py +@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase): + ('2', '8'): {'multiline': 6.2, + 'textsize': 2.5, + 'getters': (12, 16)}, ++ ('2', '9'): {'multiline': 6.2, ++ 'textsize': 2.5, ++ 'getters': (12, 16)}, + 'Default': {'multiline': 0.5, + 'textsize': 0.5, + 'getters': (12, 16)}, diff --git a/dev-python/pillow/pillow-4.3.0-r1.ebuild b/dev-python/pillow/pillow-4.3.0-r1.ebuild index 28006e3c411..9b35828ba01 100644 --- a/dev-python/pillow/pillow-4.3.0-r1.ebuild +++ b/dev-python/pillow/pillow-4.3.0-r1.ebuild @@ -45,6 +45,8 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/pillow-4.3.0-no-scripts.patch + # can be removed at v5, patch already uptream. See bug 593816. + "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch ) python_compile() { @@ -71,15 +73,7 @@ python_compile_all() { python_test() { "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - # These excluded tests below depend heavily on freetype being at the exact - # same as the one pinned upstream. However, pillow supports a wider range - # of freetype versions. These tests are more useful to upstream developer - # than to us. Disabling. See bug 593816. - virtx nosetests -vx \ - -e "test_multiline_spacing" \ - -e "test_render_multiline(_text)?" \ - -e "test_textsize_equal" \ - Tests/test_*.py + virtx nosetests -vx Tests/test_*.py } python_install() {