diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index b1e5ea7905a0..5a87bfd42c2b 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -7,18 +7,19 @@ , compreffor , booleanoperations , cffsubr +, ufoLib2 , pytestCheckHook }: buildPythonPackage rec { pname = "ufo2ft"; - version = "2.27.0"; + version = "2.28.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "r5bE4M/blt5TKzP43MpijwYY6ll3aasszmGksY5WTTE="; + sha256 = "sha256-pWHvjAvHNWlmJiQ75JRmFyrjYnzbJG7M8/DGoIWpEBk="; }; patches = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { compreffor booleanoperations cffsubr + ufoLib2 ]; checkInputs = [ diff --git a/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch b/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch index 892cd4abeb30..56aba78b5b31 100644 --- a/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch +++ b/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch @@ -1,4 +1,4 @@ -From 0b3631e91c93d56460929f40850f7d8a39a71bde Mon Sep 17 00:00:00 2001 +From eb63747509b2c18793b95eb12cc0141277520798 Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Thu, 11 Feb 2021 09:43:41 +0000 Subject: [PATCH 1/2] Rename cu2qu to fontTools.cu2qu @@ -6,14 +6,13 @@ Subject: [PATCH 1/2] Rename cu2qu to fontTools.cu2qu --- Lib/ufo2ft/filters/cubicToQuadratic.py | 4 ++-- Lib/ufo2ft/preProcessor.py | 4 ++-- - requirements.txt | 1 - setup.py | 1 - tests/outlineCompiler_test.py | 2 +- tests/preProcessor_test.py | 2 +- - 6 files changed, 6 insertions(+), 8 deletions(-) + 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py -index 87d81b1f..4b77144f 100644 +index 87d81b1..4b77144 100644 --- a/Lib/ufo2ft/filters/cubicToQuadratic.py +++ b/Lib/ufo2ft/filters/cubicToQuadratic.py @@ -1,7 +1,7 @@ @@ -27,44 +26,44 @@ index 87d81b1f..4b77144f 100644 from ufo2ft.filters import BaseFilter from ufo2ft.fontInfoData import getAttrWithFallback diff --git a/Lib/ufo2ft/preProcessor.py b/Lib/ufo2ft/preProcessor.py -index 05ac47dc..c796df2e 100644 +index e239152..9463aea 100644 --- a/Lib/ufo2ft/preProcessor.py +++ b/Lib/ufo2ft/preProcessor.py -@@ -217,7 +217,7 @@ def __init__( - layerNames=None, +@@ -267,7 +267,7 @@ class TTFInterpolatablePreProcessor: skipExportGlyphs=None, + filters=None, ): - from cu2qu.ufo import DEFAULT_MAX_ERR + from fontTools.cu2qu.ufo import DEFAULT_MAX_ERR self.ufos = ufos self.inplace = inplace -@@ -249,7 +249,7 @@ def __init__( - self.postFilters.append(post) +@@ -304,7 +304,7 @@ class TTFInterpolatablePreProcessor: + self.postFilters = [[f for f in filters if not f.pre] for filters in filterses] def process(self): - from cu2qu.ufo import fonts_to_quadratic + from fontTools.cu2qu.ufo import fonts_to_quadratic - # first apply all custom pre-filters - for funcs, ufo, glyphSet in zip(self.preFilters, self.ufos, self.glyphSets): + needs_decomposition = set() + diff --git a/setup.py b/setup.py -index 175429af..eef39ee1 100644 +index d8d9982..a165ab1 100644 --- a/setup.py +++ b/setup.py -@@ -30,7 +30,6 @@ +@@ -30,7 +30,6 @@ setup( tests_require=["pytest>=2.8"], install_requires=[ - "fonttools[ufo]>=4.28.5", + "fonttools[ufo]>=4.34.0", - "cu2qu>=1.6.7", "cffsubr>=0.2.8", "booleanOperations>=0.9.0", ], diff --git a/tests/outlineCompiler_test.py b/tests/outlineCompiler_test.py -index 74319184..e7b15a23 100644 +index b31319c..ee51920 100644 --- a/tests/outlineCompiler_test.py +++ b/tests/outlineCompiler_test.py -@@ -2,7 +2,7 @@ +@@ -2,7 +2,7 @@ import logging import os import pytest @@ -74,10 +73,10 @@ index 74319184..e7b15a23 100644 from fontTools.ttLib.tables._g_l_y_f import USE_MY_METRICS diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py -index 64196f92..87b23946 100644 +index 11196f8..bc32d55 100644 --- a/tests/preProcessor_test.py +++ b/tests/preProcessor_test.py -@@ -2,7 +2,7 @@ +@@ -2,7 +2,7 @@ import logging import os import pytest @@ -86,8 +85,10 @@ index 64196f92..87b23946 100644 from fontTools import designspaceLib import ufo2ft +-- +2.36.1 -From 27c5af88ec2c3314618ecbf65104050a53508bb0 Mon Sep 17 00:00:00 2001 +From 58f3ab5e5db8090aba10fefd58ad8df4b507e7c3 Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Thu, 11 Feb 2021 09:49:28 +0000 Subject: [PATCH 2/2] Sort the imports @@ -98,7 +99,7 @@ Subject: [PATCH 2/2] Sort the imports 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py -index 4b77144f..5f28ea42 100644 +index 4b77144..5f28ea4 100644 --- a/Lib/ufo2ft/filters/cubicToQuadratic.py +++ b/Lib/ufo2ft/filters/cubicToQuadratic.py @@ -1,7 +1,7 @@ @@ -111,10 +112,10 @@ index 4b77144f..5f28ea42 100644 from ufo2ft.filters import BaseFilter from ufo2ft.fontInfoData import getAttrWithFallback diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py -index 87b23946..76ee495a 100644 +index bc32d55..41c579c 100644 --- a/tests/preProcessor_test.py +++ b/tests/preProcessor_test.py -@@ -2,8 +2,8 @@ +@@ -2,8 +2,8 @@ import logging import os import pytest @@ -124,3 +125,6 @@ index 87b23946..76ee495a 100644 import ufo2ft from ufo2ft.constants import ( +-- +2.36.1 +