[bug#38742] [PATCH] gnu: python-fonttools: Update to 4.2.2

[bug#38742] [PATCH] gnu: python-fonttools: Update to 4.2.2

[Riku Viitanen via Guix-patches via]

This updates python-fonttools to the newest version (4.2.2).
python2-fonttools is only updated to 3.44.0, as the 4.x versions don't support Python 2.

* gnu/packages/python-xyz.scm (python-fonttools): Update to 4.2.2.
* gnu/packages/python-xyz.scm (python2-fonttools): Update to 3.44.0.
---
 gnu/packages/python-xyz.scm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c06c2199de..4d6dd7b32d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -68,6 +68,7 @@
 ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
 ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2019 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
+;;; Copyright © 2019 Riku Viitanen <riku.viitanen@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6803,16 +6804,15 @@ add functionality and customization to your projects with their own plugins.")
 (define-public python2-straight-plugin
   (package-with-python2 python-straight-plugin))
 
-(define-public python-fonttools
+(define (python-fonttools-version version hash)
   (package
     (name "python-fonttools")
-    (version "3.38.0")
+    (version version)
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "fonttools" version ".zip"))
               (sha256
-               (base32
-                "12ripk3s7skgxr1bs9r8n13r94ym3s8iir7ivfixls9fa4dabmlh"))))
+               (base32 hash))))
     (build-system python-build-system)
     (native-inputs
      `(("unzip" ,unzip)
@@ -6828,8 +6828,16 @@ also contains a tool called “TTX” which converts TrueType/OpenType fonts to
 from an XML-based format.")
     (license license:expat)))
 
+(define-public python-fonttools
+  (python-fonttools-version
+    "4.2.2"
+    "012qqspnwdl4vy8qgzzpfglkk5dgzxiw0fak2jq74ngygvz3vfv6"))
+
 (define-public python2-fonttools
-  (package-with-python2 python-fonttools))
+  (package-with-python2
+    (python-fonttools-version
+      "3.44.0"  ;; last version to support Python 2
+      "0v6399g755f2hn1ry62i5b6gdinf2fpx2966v3bxh6bjw1accb5p")))
 
 (define-public python-ly
   (package
--
2.24.0

[bug#38742] [PATCH] gnu: python-fonttools: Update to 4.2.2

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]

Hi,

thanks for the patch!  I have a few comments below:

* I can't apply it.  There's two parts in your message:
  (1) A rfc822 format file with MIME escape parts (like "=C2=A0") in it which "git am" cannot use and which looks very unusable.
  (2) A plain text format file (much better) which is missing the author information ("From"...)--so "git am" cannot use it.
  If that's a problem with our Guix-patches tooling (or my mail client), I apologize, but even with manual editing I could not apply (2).  (1) is out of the question.
  Please use "git format-patch -1" after committing the change to your local git repository in order to create the patch.
  You can revert your patch using "git reset HEAD~1" and then try "git am your-patchfile" on your side to see whether we would be able to apply it.
* Please rename the procedure from "python-fonttools-version" to "python-fonttools-package" for consistency with other places we do that.
* Please mention the new procedure in the commit log.
* Please put maintainer comments into the source code, not the commit log.
* A comment trailing a scheme line should have only one ";".

> +    (python-fonttools-version

python-fonttools-package

> +      "3.44.0"  ;; last version to support Python 2

+      "3.44.0"  ; last version to support Python 2

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#38742] [PATCH] gnu: python-fonttools: Update to 4.2.2

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 748 bytes --]

Riku Viitanen via Guix-patches via <guix-patches@gnu.org> writes:

> This updates python-fonttools to the newest version (4.2.2).
> python2-fonttools is only updated to 3.44.0, as the 4.x versions don't support Python 2.
>
> * gnu/packages/python-xyz.scm (python-fonttools): Update to 4.2.2.
> * gnu/packages/python-xyz.scm (python2-fonttools): Update to 3.44.0.

Thanks for the patch!  Note that python-fonttools has 4481 dependent
packages according to 'guix refresh -l python-fonttools', so this change
must go through the 'core-updates' branch.

We already have python-fonttools version 4.2.0 on that branch, so this
patch needs to be adjusted a little.  Can you rebase this on the
'core-updates' branch and send an updated patch?

TIA,
Marius

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#38742] [PATCH] gnu: python-fonttools: Update to 4.2.2

[Riku Viitanen via Guix-patches via]

Here's the rebased patch. I accidentally sent it to only Marius earlier.

Python2-fonttools is already 3.44.0 in core-updates, so I left that untouched.

From cb683c9119753df4734bebe5855d2d1993b04cff Mon Sep 17 00:00:00 2001
From: Riku Viitanen <riku.viitanen@protonmail.com>
Date: Thu, 26 Dec 2019 20:00:01 +0200
Subject: [PATCH] gnu: python-fonttools: Update to 4.2.2.

* gnu/packages/python-xyz.scm (python-fonttools): Update to 4.2.2.
---
 gnu/packages/python-xyz.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 75b8a4cc08..9c830c2bc3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -67,6 +67,7 @@
 ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
 ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
+;;; Copyright © 2019 Riku Viitanen <riku.viitanen@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6805,13 +6806,13 @@ add functionality and customization to your projects with their own plugins.")
 (define-public python-fonttools
   (package
     (name "python-fonttools")
-    (version "4.2.0")
+    (version "4.2.2")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "fonttools" version ".zip"))
               (sha256
                (base32
-                "0psy6z52jn49wp93s3k7kj0jzji1cad3wnwgm6c26vphv5appk4v"))))
+                "012qqspnwdl4vy8qgzzpfglkk5dgzxiw0fak2jq74ngygvz3vfv6"))))
     (build-system python-build-system)
     (native-inputs
      `(("unzip" ,unzip)
--
2.24.0

bug#38742: [PATCH] gnu: python-fonttools: Update to 4.2.2

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

Riku Viitanen <riku.viitanen@protonmail.com> writes:

> Here's the rebased patch. I accidentally sent it to only Marius earlier.
>
> Python2-fonttools is already 3.44.0 in core-updates, so I left that untouched.
>
> From cb683c9119753df4734bebe5855d2d1993b04cff Mon Sep 17 00:00:00 2001
> From: Riku Viitanen <riku.viitanen@protonmail.com>
> Date: Thu, 26 Dec 2019 20:00:01 +0200
> Subject: [PATCH] gnu: python-fonttools: Update to 4.2.2.
>
> * gnu/packages/python-xyz.scm (python-fonttools): Update to 4.2.2.

Pushed to 'core-updates', thanks!

By the way, I notice the tests are no longer running (it was also the
case before this patch).  Could you look into that?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]