* [bug#29571] [PATCH 1/2] gnu: Add python-olefile. @ 2017-12-05 0:34 Kei Kebreau 2017-12-05 0:34 ` [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0 Kei Kebreau 2017-12-22 9:01 ` [bug#29571] [PATCH 1/2] gnu: Add python-olefile Ludovic Courtès 0 siblings, 2 replies; 8+ messages in thread From: Kei Kebreau @ 2017-12-05 0:34 UTC (permalink / raw) To: 29571; +Cc: Kei Kebreau * gnu/packages/python.scm (python-olefile): New variable. --- gnu/packages/python.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 01b4e2cd2..4304cd7f5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3643,6 +3643,29 @@ Python's distutils.") services for your Python modules and applications.") (license license:lgpl3+))) +(define-public python-olefile + (package + (name "python-olefile") + (version "0.44") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/decalage2/olefile/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wmxbrhyqjry2000zx0zdhqdqxhgi06nz7sbzjlh222q2zjv1gpj")))) + (build-system python-build-system) + (home-page + "https://www.decalage.info/python/olefileio") + (synopsis "Read and write Microsoft OLE2 files.") + (description + "@code{olefile} can parse, read and write Microsoft OLE2 files (Structured +Storage or Compound Document, Microsoft Office). It is an improved version of +the OleFileIO module from PIL, the Python Image Library.") + (license license:bsd-3))) + (define-public python-pillow (package (name "python-pillow") -- 2.15.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. 2017-12-05 0:34 [bug#29571] [PATCH 1/2] gnu: Add python-olefile Kei Kebreau @ 2017-12-05 0:34 ` Kei Kebreau 2017-12-16 8:46 ` Ricardo Wurmus 2017-12-22 9:01 ` [bug#29571] [PATCH 1/2] gnu: Add python-olefile Ludovic Courtès 1 sibling, 1 reply; 8+ messages in thread From: Kei Kebreau @ 2017-12-05 0:34 UTC (permalink / raw) To: 29572; +Cc: Kei Kebreau * gnu/packages/python.scm (python-pillow): Update to 4.3.0. * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-pillow-freetype-2.7-test-failure.patch | 75 ---------------------- gnu/packages/python.scm | 7 +- 3 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 856ade412..207c8d739 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1025,7 +1025,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pandas-skip-failing-tests.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pillow-freetype-2.7-test-failure.patch \ %D%/packages/patches/python-pygit2-disable-network-tests.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch b/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch deleted file mode 100644 index 18bc30bc7..000000000 --- a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch +++ /dev/null @@ -1,75 +0,0 @@ -Fix some test failures when building with freetype-2.7. - -https://github.com/python-pillow/Pillow/issues/2116 -https://github.com/python-pillow/Pillow/pull/2286 - -Patch copied from upstream source repository: - -https://github.com/python-pillow/Pillow/commit/acf68c835c93ba144f83198306aa7e6082a43f43 - -From acf68c835c93ba144f83198306aa7e6082a43f43 Mon Sep 17 00:00:00 2001 -From: hugovk <hugovk@users.noreply.github.com> -Date: Mon, 12 Dec 2016 15:16:43 +0200 -Subject: [PATCH] Increase epsilon for FreeType 2.7 - ---- - Tests/test_imagefont.py | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py -index de89ac92..5207dce3 100644 ---- a/Tests/test_imagefont.py -+++ b/Tests/test_imagefont.py -@@ -125,7 +125,9 @@ try: - - target = 'Tests/images/rectangle_surrounding_text.png' - target_img = Image.open(target) -- self.assert_image_similar(im, target_img, .5) -+ -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 2.5) - - def test_render_multiline(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -144,7 +146,7 @@ try: - # some versions of freetype have different horizontal spacing. - # setting a tight epsilon, I'm showing the original test failure - # at epsilon = ~38. -- self.assert_image_similar(im, target_img, .5) -+ self.assert_image_similar(im, target_img, 6.2) - - def test_render_multiline_text(self): - ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) -@@ -158,7 +160,8 @@ try: - target = 'Tests/images/multiline_text.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - # Test that text() can pass on additional arguments - # to multiline_text() -@@ -178,7 +181,8 @@ try: - target = 'Tests/images/multiline_text'+ext+'.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_unknown_align(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -227,7 +231,8 @@ try: - target = 'Tests/images/multiline_text_spacing.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_rotated_transposed_font(self): - img_grey = Image.new("L", (100, 100)) --- -2.12.0 - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4304cd7f5..ea4de9484 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3669,15 +3669,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "3.3.3") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) - (patches (search-patches "python-pillow-freetype-2.7-test-failure.patch")) (sha256 (base32 - "0xkv0p1d73gz0a1qaasf0ai4262g8f334j07vd60bjrxs2wr3nmj")))) + "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) @@ -3689,6 +3688,8 @@ the OleFileIO module from PIL, the Python Image Library.") ("openjpeg" ,openjpeg) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) + (propagated-inputs + `(("python-olefile" ,python-olefile))) (arguments `(#:phases (modify-phases %standard-phases (add-after -- 2.15.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. 2017-12-05 0:34 ` [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0 Kei Kebreau @ 2017-12-16 8:46 ` Ricardo Wurmus 2017-12-16 15:15 ` Kei Kebreau 0 siblings, 1 reply; 8+ messages in thread From: Ricardo Wurmus @ 2017-12-16 8:46 UTC (permalink / raw) To: Kei Kebreau; +Cc: 29572 Hi Kei, > * gnu/packages/python.scm (python-pillow): Update to 4.3.0. > * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: > Delete file. > * gnu/local.mk (dist_patch_DATA): Remove it. […] > + (propagated-inputs > + `(("python-olefile" ,python-olefile))) The commit message fails to mention python-olefile. I cannot find a definition for python-olefile; did you forget to attach it? -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. 2017-12-16 8:46 ` Ricardo Wurmus @ 2017-12-16 15:15 ` Kei Kebreau 2017-12-22 9:02 ` Ludovic Courtès 0 siblings, 1 reply; 8+ messages in thread From: Kei Kebreau @ 2017-12-16 15:15 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: 29572 [-- Attachment #1.1: Type: text/plain, Size: 765 bytes --] Ricardo Wurmus <rekado@elephly.net> writes: > Hi Kei, > >> * gnu/packages/python.scm (python-pillow): Update to 4.3.0. >> * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: >> Delete file. >> * gnu/local.mk (dist_patch_DATA): Remove it. > […] >> + (propagated-inputs >> + `(("python-olefile" ,python-olefile))) > > The commit message fails to mention python-olefile. I cannot find a > definition for python-olefile; did you forget to attach it? > I've attached a patch with a corrected commit message. The definition for python-olefile ended up as a different bug number (#29571). Thanks for looking at this. > -- > Ricardo > > GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC > https://elephly.net [-- Attachment #1.2: 0001-gnu-python-pillow-Update-to-4.3.0.patch --] [-- Type: text/plain, Size: 5937 bytes --] From 39d41a2c43598d0ebbad46ee552afe683305f031 Mon Sep 17 00:00:00 2001 From: Kei Kebreau <kkebreau@posteo.net> Date: Mon, 4 Dec 2017 17:56:37 -0500 Subject: [PATCH] gnu: python-pillow: Update to 4.3.0. * gnu/packages/python.scm (python-pillow): Update to 4.3.0. [propagated-inputs]: Add python-olefile. * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-pillow-freetype-2.7-test-failure.patch | 75 ---------------------- gnu/packages/python.scm | 7 +- 3 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 636919550..d7f4fb745 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1022,7 +1022,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pandas-skip-failing-tests.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pillow-freetype-2.7-test-failure.patch \ %D%/packages/patches/python-pygit2-disable-network-tests.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch b/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch deleted file mode 100644 index 18bc30bc7..000000000 --- a/gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch +++ /dev/null @@ -1,75 +0,0 @@ -Fix some test failures when building with freetype-2.7. - -https://github.com/python-pillow/Pillow/issues/2116 -https://github.com/python-pillow/Pillow/pull/2286 - -Patch copied from upstream source repository: - -https://github.com/python-pillow/Pillow/commit/acf68c835c93ba144f83198306aa7e6082a43f43 - -From acf68c835c93ba144f83198306aa7e6082a43f43 Mon Sep 17 00:00:00 2001 -From: hugovk <hugovk@users.noreply.github.com> -Date: Mon, 12 Dec 2016 15:16:43 +0200 -Subject: [PATCH] Increase epsilon for FreeType 2.7 - ---- - Tests/test_imagefont.py | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py -index de89ac92..5207dce3 100644 ---- a/Tests/test_imagefont.py -+++ b/Tests/test_imagefont.py -@@ -125,7 +125,9 @@ try: - - target = 'Tests/images/rectangle_surrounding_text.png' - target_img = Image.open(target) -- self.assert_image_similar(im, target_img, .5) -+ -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 2.5) - - def test_render_multiline(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -144,7 +146,7 @@ try: - # some versions of freetype have different horizontal spacing. - # setting a tight epsilon, I'm showing the original test failure - # at epsilon = ~38. -- self.assert_image_similar(im, target_img, .5) -+ self.assert_image_similar(im, target_img, 6.2) - - def test_render_multiline_text(self): - ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) -@@ -158,7 +160,8 @@ try: - target = 'Tests/images/multiline_text.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - # Test that text() can pass on additional arguments - # to multiline_text() -@@ -178,7 +181,8 @@ try: - target = 'Tests/images/multiline_text'+ext+'.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_unknown_align(self): - im = Image.new(mode='RGB', size=(300, 100)) -@@ -227,7 +231,8 @@ try: - target = 'Tests/images/multiline_text_spacing.png' - target_img = Image.open(target) - -- self.assert_image_similar(im, target_img, .5) -+ # Epsilon ~.5 fails with FreeType 2.7 -+ self.assert_image_similar(im, target_img, 6.2) - - def test_rotated_transposed_font(self): - img_grey = Image.new("L", (100, 100)) --- -2.12.0 - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 082856bfb..5db90df3e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3660,15 +3660,14 @@ services for your Python modules and applications.") (define-public python-pillow (package (name "python-pillow") - (version "3.3.3") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) - (patches (search-patches "python-pillow-freetype-2.7-test-failure.patch")) (sha256 (base32 - "0xkv0p1d73gz0a1qaasf0ai4262g8f334j07vd60bjrxs2wr3nmj")))) + "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) @@ -3680,6 +3679,8 @@ services for your Python modules and applications.") ("openjpeg" ,openjpeg) ("libtiff" ,libtiff) ("libwebp" ,libwebp))) + (propagated-inputs + `(("python-olefile" ,python-olefile))) (arguments `(#:phases (modify-phases %standard-phases (add-after -- 2.15.1 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. 2017-12-16 15:15 ` Kei Kebreau @ 2017-12-22 9:02 ` Ludovic Courtès 2017-12-22 16:52 ` bug#29572: " Kei Kebreau 0 siblings, 1 reply; 8+ messages in thread From: Ludovic Courtès @ 2017-12-22 9:02 UTC (permalink / raw) To: Kei Kebreau; +Cc: Ricardo Wurmus, 29572 Kei Kebreau <kkebreau@posteo.net> skribis: > I've attached a patch with a corrected commit message. The definition > for python-olefile ended up as a different bug number (#29571). [...] > From 39d41a2c43598d0ebbad46ee552afe683305f031 Mon Sep 17 00:00:00 2001 > From: Kei Kebreau <kkebreau@posteo.net> > Date: Mon, 4 Dec 2017 17:56:37 -0500 > Subject: [PATCH] gnu: python-pillow: Update to 4.3.0. > > * gnu/packages/python.scm (python-pillow): Update to 4.3.0. > [propagated-inputs]: Add python-olefile. > * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: > Delete file. > * gnu/local.mk (dist_patch_DATA): Remove it. The commit message looks great to me. ;-) Please push, thank you! Ludo'. ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#29572: [PATCH 2/2] gnu: python-pillow: Update to 4.3.0. 2017-12-22 9:02 ` Ludovic Courtès @ 2017-12-22 16:52 ` Kei Kebreau 0 siblings, 0 replies; 8+ messages in thread From: Kei Kebreau @ 2017-12-22 16:52 UTC (permalink / raw) To: Ludovic Courtès; +Cc: Ricardo Wurmus, 29572-done [-- Attachment #1: Type: text/plain, Size: 846 bytes --] ludo@gnu.org (Ludovic Courtès) writes: > Kei Kebreau <kkebreau@posteo.net> skribis: > >> I've attached a patch with a corrected commit message. The definition >> for python-olefile ended up as a different bug number (#29571). > > [...] > >> From 39d41a2c43598d0ebbad46ee552afe683305f031 Mon Sep 17 00:00:00 2001 >> From: Kei Kebreau <kkebreau@posteo.net> >> Date: Mon, 4 Dec 2017 17:56:37 -0500 >> Subject: [PATCH] gnu: python-pillow: Update to 4.3.0. >> >> * gnu/packages/python.scm (python-pillow): Update to 4.3.0. >> [propagated-inputs]: Add python-olefile. >> * gnu/packages/patches/python-pillow-freetype-2.7-test-failure.patch: >> Delete file. >> * gnu/local.mk (dist_patch_DATA): Remove it. > > The commit message looks great to me. ;-) > > Please push, thank you! > > Ludo'. Done! Thank you for reviewing! [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#29571] [PATCH 1/2] gnu: Add python-olefile. 2017-12-05 0:34 [bug#29571] [PATCH 1/2] gnu: Add python-olefile Kei Kebreau 2017-12-05 0:34 ` [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0 Kei Kebreau @ 2017-12-22 9:01 ` Ludovic Courtès 2017-12-22 16:51 ` bug#29571: " Kei Kebreau 1 sibling, 1 reply; 8+ messages in thread From: Ludovic Courtès @ 2017-12-22 9:01 UTC (permalink / raw) To: Kei Kebreau; +Cc: 29571 Hello! Kei Kebreau <kkebreau@posteo.net> skribis: > * gnu/packages/python.scm (python-olefile): New variable. [...] > +(define-public python-olefile > + (package > + (name "python-olefile") > + (version "0.44") Did you purposefully omit the “python2-” variant? If so, please add a tiny comment explaining this and push. Thanks, Ludo’. ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#29571: [PATCH 1/2] gnu: Add python-olefile. 2017-12-22 9:01 ` [bug#29571] [PATCH 1/2] gnu: Add python-olefile Ludovic Courtès @ 2017-12-22 16:51 ` Kei Kebreau 0 siblings, 0 replies; 8+ messages in thread From: Kei Kebreau @ 2017-12-22 16:51 UTC (permalink / raw) To: Ludovic Courtès; +Cc: 29571-done [-- Attachment #1: Type: text/plain, Size: 479 bytes --] ludo@gnu.org (Ludovic Courtès) writes: > Hello! > > Kei Kebreau <kkebreau@posteo.net> skribis: > >> * gnu/packages/python.scm (python-olefile): New variable. > > [...] > >> +(define-public python-olefile >> + (package >> + (name "python-olefile") >> + (version "0.44") > > Did you purposefully omit the “python2-” variant? If so, please add a > tiny comment explaining this and push. No, I did not! Added and pushed. > > Thanks, > Ludo’. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-12-22 16:53 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-12-05 0:34 [bug#29571] [PATCH 1/2] gnu: Add python-olefile Kei Kebreau 2017-12-05 0:34 ` [bug#29572] [PATCH 2/2] gnu: python-pillow: Update to 4.3.0 Kei Kebreau 2017-12-16 8:46 ` Ricardo Wurmus 2017-12-16 15:15 ` Kei Kebreau 2017-12-22 9:02 ` Ludovic Courtès 2017-12-22 16:52 ` bug#29572: " Kei Kebreau 2017-12-22 9:01 ` [bug#29571] [PATCH 1/2] gnu: Add python-olefile Ludovic Courtès 2017-12-22 16:51 ` bug#29571: " Kei Kebreau
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).