| 1 |
commit: 7dd0d64be1679025f5cc9c46da39b5b3ed2f8298 |
| 2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 29 02:54:27 2018 +0000 |
| 4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 29 02:54:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd0d64b |
| 7 |
|
| 8 |
dev-python/pillow: make all tests pass on 4.3.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/593816 |
| 11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 12 |
|
| 13 |
.../pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch | 12 ++++++++++++ |
| 14 |
dev-python/pillow/pillow-4.3.0-r1.ebuild | 12 +++--------- |
| 15 |
2 files changed, 15 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..211ef7ac58d |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch |
| 22 |
@@ -0,0 +1,12 @@ |
| 23 |
+--- a/Tests/test_imagefont.py |
| 24 |
++++ b/Tests/test_imagefont.py |
| 25 |
+@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase): |
| 26 |
+ ('2', '8'): {'multiline': 6.2, |
| 27 |
+ 'textsize': 2.5, |
| 28 |
+ 'getters': (12, 16)}, |
| 29 |
++ ('2', '9'): {'multiline': 6.2, |
| 30 |
++ 'textsize': 2.5, |
| 31 |
++ 'getters': (12, 16)}, |
| 32 |
+ 'Default': {'multiline': 0.5, |
| 33 |
+ 'textsize': 0.5, |
| 34 |
+ 'getters': (12, 16)}, |
| 35 |
|
| 36 |
diff --git a/dev-python/pillow/pillow-4.3.0-r1.ebuild b/dev-python/pillow/pillow-4.3.0-r1.ebuild |
| 37 |
index 28006e3c411..9b35828ba01 100644 |
| 38 |
--- a/dev-python/pillow/pillow-4.3.0-r1.ebuild |
| 39 |
+++ b/dev-python/pillow/pillow-4.3.0-r1.ebuild |
| 40 |
@@ -45,6 +45,8 @@ S="${WORKDIR}/${MY_P}" |
| 41 |
|
| 42 |
PATCHES=( |
| 43 |
"${FILESDIR}"/pillow-4.3.0-no-scripts.patch |
| 44 |
+ # can be removed at v5, patch already uptream. See bug 593816. |
| 45 |
+ "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch |
| 46 |
) |
| 47 |
|
| 48 |
python_compile() { |
| 49 |
@@ -71,15 +73,7 @@ python_compile_all() { |
| 50 |
|
| 51 |
python_test() { |
| 52 |
"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" |
| 53 |
- # These excluded tests below depend heavily on freetype being at the exact |
| 54 |
- # same as the one pinned upstream. However, pillow supports a wider range |
| 55 |
- # of freetype versions. These tests are more useful to upstream developer |
| 56 |
- # than to us. Disabling. See bug 593816. |
| 57 |
- virtx nosetests -vx \ |
| 58 |
- -e "test_multiline_spacing" \ |
| 59 |
- -e "test_render_multiline(_text)?" \ |
| 60 |
- -e "test_textsize_equal" \ |
| 61 |
- Tests/test_*.py |
| 62 |
+ virtx nosetests -vx Tests/test_*.py |
| 63 |
} |
| 64 |
|
| 65 |
python_install() { |
Archives