pyrox.dev / nixpkgs
lol
fork atom

python3Packages.ufo2ft: 2.27.0 -> 2.28.0

Martin Weinelt fc5b1e92 b1866a37

+30 -24
+4 -2
pkgs/development/python-modules/ufo2ft/default.nix
··· 7 7 , compreffor 8 8 , booleanoperations 9 9 , cffsubr 10 + , ufoLib2 10 11 , pytestCheckHook 11 12 }: 12 13 13 14 buildPythonPackage rec { 14 15 pname = "ufo2ft"; 15 - version = "2.27.0"; 16 + version = "2.28.0"; 16 17 17 18 format = "setuptools"; 18 19 19 20 src = fetchPypi { 20 21 inherit pname version; 21 - sha256 = "r5bE4M/blt5TKzP43MpijwYY6ll3aasszmGksY5WTTE="; 22 + sha256 = "sha256-pWHvjAvHNWlmJiQ75JRmFyrjYnzbJG7M8/DGoIWpEBk="; 22 23 }; 23 24 24 25 patches = [ ··· 37 38 compreffor 38 39 booleanoperations 39 40 cffsubr 41 + ufoLib2 40 42 ]; 41 43 42 44 checkInputs = [
+26 -22
pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch
··· 1 - From 0b3631e91c93d56460929f40850f7d8a39a71bde Mon Sep 17 00:00:00 2001 1 + From eb63747509b2c18793b95eb12cc0141277520798 Mon Sep 17 00:00:00 2001 2 2 From: Simon Cozens <simon@simon-cozens.org> 3 3 Date: Thu, 11 Feb 2021 09:43:41 +0000 4 4 Subject: [PATCH 1/2] Rename cu2qu to fontTools.cu2qu ··· 6 6 --- 7 7 Lib/ufo2ft/filters/cubicToQuadratic.py | 4 ++-- 8 8 Lib/ufo2ft/preProcessor.py | 4 ++-- 9 - requirements.txt | 1 - 10 9 setup.py | 1 - 11 10 tests/outlineCompiler_test.py | 2 +- 12 11 tests/preProcessor_test.py | 2 +- 13 - 6 files changed, 6 insertions(+), 8 deletions(-) 12 + 5 files changed, 6 insertions(+), 7 deletions(-) 14 13 15 14 diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py 16 - index 87d81b1f..4b77144f 100644 15 + index 87d81b1..4b77144 100644 17 16 --- a/Lib/ufo2ft/filters/cubicToQuadratic.py 18 17 +++ b/Lib/ufo2ft/filters/cubicToQuadratic.py 19 18 @@ -1,7 +1,7 @@ ··· 27 26 from ufo2ft.filters import BaseFilter 28 27 from ufo2ft.fontInfoData import getAttrWithFallback 29 28 diff --git a/Lib/ufo2ft/preProcessor.py b/Lib/ufo2ft/preProcessor.py 30 - index 05ac47dc..c796df2e 100644 29 + index e239152..9463aea 100644 31 30 --- a/Lib/ufo2ft/preProcessor.py 32 31 +++ b/Lib/ufo2ft/preProcessor.py 33 - @@ -217,7 +217,7 @@ def __init__( 34 - layerNames=None, 32 + @@ -267,7 +267,7 @@ class TTFInterpolatablePreProcessor: 35 33 skipExportGlyphs=None, 34 + filters=None, 36 35 ): 37 36 - from cu2qu.ufo import DEFAULT_MAX_ERR 38 37 + from fontTools.cu2qu.ufo import DEFAULT_MAX_ERR 39 38 40 39 self.ufos = ufos 41 40 self.inplace = inplace 42 - @@ -249,7 +249,7 @@ def __init__( 43 - self.postFilters.append(post) 41 + @@ -304,7 +304,7 @@ class TTFInterpolatablePreProcessor: 42 + self.postFilters = [[f for f in filters if not f.pre] for filters in filterses] 44 43 45 44 def process(self): 46 45 - from cu2qu.ufo import fonts_to_quadratic 47 46 + from fontTools.cu2qu.ufo import fonts_to_quadratic 48 47 49 - # first apply all custom pre-filters 50 - for funcs, ufo, glyphSet in zip(self.preFilters, self.ufos, self.glyphSets): 48 + needs_decomposition = set() 49 + 51 50 diff --git a/setup.py b/setup.py 52 - index 175429af..eef39ee1 100644 51 + index d8d9982..a165ab1 100644 53 52 --- a/setup.py 54 53 +++ b/setup.py 55 - @@ -30,7 +30,6 @@ 54 + @@ -30,7 +30,6 @@ setup( 56 55 tests_require=["pytest>=2.8"], 57 56 install_requires=[ 58 - "fonttools[ufo]>=4.28.5", 57 + "fonttools[ufo]>=4.34.0", 59 58 - "cu2qu>=1.6.7", 60 59 "cffsubr>=0.2.8", 61 60 "booleanOperations>=0.9.0", 62 61 ], 63 62 diff --git a/tests/outlineCompiler_test.py b/tests/outlineCompiler_test.py 64 - index 74319184..e7b15a23 100644 63 + index b31319c..ee51920 100644 65 64 --- a/tests/outlineCompiler_test.py 66 65 +++ b/tests/outlineCompiler_test.py 67 - @@ -2,7 +2,7 @@ 66 + @@ -2,7 +2,7 @@ import logging 68 67 import os 69 68 70 69 import pytest ··· 74 73 from fontTools.ttLib.tables._g_l_y_f import USE_MY_METRICS 75 74 76 75 diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py 77 - index 64196f92..87b23946 100644 76 + index 11196f8..bc32d55 100644 78 77 --- a/tests/preProcessor_test.py 79 78 +++ b/tests/preProcessor_test.py 80 - @@ -2,7 +2,7 @@ 79 + @@ -2,7 +2,7 @@ import logging 81 80 import os 82 81 83 82 import pytest ··· 86 85 from fontTools import designspaceLib 87 86 88 87 import ufo2ft 88 + -- 89 + 2.36.1 89 90 90 - From 27c5af88ec2c3314618ecbf65104050a53508bb0 Mon Sep 17 00:00:00 2001 91 + From 58f3ab5e5db8090aba10fefd58ad8df4b507e7c3 Mon Sep 17 00:00:00 2001 91 92 From: Simon Cozens <simon@simon-cozens.org> 92 93 Date: Thu, 11 Feb 2021 09:49:28 +0000 93 94 Subject: [PATCH 2/2] Sort the imports ··· 98 99 2 files changed, 2 insertions(+), 2 deletions(-) 99 100 100 101 diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py 101 - index 4b77144f..5f28ea42 100644 102 + index 4b77144..5f28ea4 100644 102 103 --- a/Lib/ufo2ft/filters/cubicToQuadratic.py 103 104 +++ b/Lib/ufo2ft/filters/cubicToQuadratic.py 104 105 @@ -1,7 +1,7 @@ ··· 111 112 from ufo2ft.filters import BaseFilter 112 113 from ufo2ft.fontInfoData import getAttrWithFallback 113 114 diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py 114 - index 87b23946..76ee495a 100644 115 + index bc32d55..41c579c 100644 115 116 --- a/tests/preProcessor_test.py 116 117 +++ b/tests/preProcessor_test.py 117 - @@ -2,8 +2,8 @@ 118 + @@ -2,8 +2,8 @@ import logging 118 119 import os 119 120 120 121 import pytest ··· 124 125 125 126 import ufo2ft 126 127 from ufo2ft.constants import ( 128 + -- 129 + 2.36.1 130 +