pyrox.dev
1From eb63747509b2c18793b95eb12cc0141277520798 Mon Sep 17 00:00:00 2001
2From: Simon Cozens <simon@simon-cozens.org>
3Date: Thu, 11 Feb 2021 09:43:41 +0000
4Subject: [PATCH 1/2] Rename cu2qu to fontTools.cu2qu
5
6---
7 Lib/ufo2ft/filters/cubicToQuadratic.py | 4 ++--
8 Lib/ufo2ft/preProcessor.py | 4 ++--
9 setup.py | 1 -
10 tests/outlineCompiler_test.py | 2 +-
11 tests/preProcessor_test.py | 2 +-
12 5 files changed, 6 insertions(+), 7 deletions(-)
13
14diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py
15index 87d81b1..4b77144 100644
16--- a/Lib/ufo2ft/filters/cubicToQuadratic.py
17+++ b/Lib/ufo2ft/filters/cubicToQuadratic.py
18@@ -1,7 +1,7 @@
19 import logging
20
21-from cu2qu.pens import Cu2QuPointPen
22-from cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR
23+from fontTools.pens.cu2quPen import Cu2QuPointPen
24+from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR
25
26 from ufo2ft.filters import BaseFilter
27 from ufo2ft.fontInfoData import getAttrWithFallback
28diff --git a/Lib/ufo2ft/preProcessor.py b/Lib/ufo2ft/preProcessor.py
29index e239152..9463aea 100644
30--- a/Lib/ufo2ft/preProcessor.py
31+++ b/Lib/ufo2ft/preProcessor.py
32@@ -267,7 +267,7 @@ class TTFInterpolatablePreProcessor:
33 skipExportGlyphs=None,
34 filters=None,
35 ):
36- from cu2qu.ufo import DEFAULT_MAX_ERR
37+ from fontTools.cu2qu.ufo import DEFAULT_MAX_ERR
38
39 self.ufos = ufos
40 self.inplace = inplace
41@@ -304,7 +304,7 @@ class TTFInterpolatablePreProcessor:
42 self.postFilters = [[f for f in filters if not f.pre] for filters in filterses]
43
44 def process(self):
45- from cu2qu.ufo import fonts_to_quadratic
46+ from fontTools.cu2qu.ufo import fonts_to_quadratic
47
48 needs_decomposition = set()
49
50diff --git a/setup.py b/setup.py
51index d8d9982..a165ab1 100644
52--- a/setup.py
53+++ b/setup.py
54@@ -30,7 +30,6 @@ setup(
55 tests_require=["pytest>=2.8"],
56 install_requires=[
57 "fonttools[ufo]>=4.34.0",
58- "cu2qu>=1.6.7",
59 "cffsubr>=0.2.8",
60 "booleanOperations>=0.9.0",
61 ],
62diff --git a/tests/outlineCompiler_test.py b/tests/outlineCompiler_test.py
63index b31319c..ee51920 100644
64--- a/tests/outlineCompiler_test.py
65+++ b/tests/outlineCompiler_test.py
66@@ -2,7 +2,7 @@ import logging
67 import os
68
69 import pytest
70-from cu2qu.ufo import font_to_quadratic
71+from fontTools.cu2qu.ufo import font_to_quadratic
72 from fontTools.ttLib import TTFont
73 from fontTools.ttLib.tables._g_l_y_f import USE_MY_METRICS
74
75diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py
76index 11196f8..bc32d55 100644
77--- a/tests/preProcessor_test.py
78+++ b/tests/preProcessor_test.py
79@@ -2,7 +2,7 @@ import logging
80 import os
81
82 import pytest
83-from cu2qu.ufo import CURVE_TYPE_LIB_KEY
84+from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY
85 from fontTools import designspaceLib
86
87 import ufo2ft
88--
892.36.1
90
91From 58f3ab5e5db8090aba10fefd58ad8df4b507e7c3 Mon Sep 17 00:00:00 2001
92From: Simon Cozens <simon@simon-cozens.org>
93Date: Thu, 11 Feb 2021 09:49:28 +0000
94Subject: [PATCH 2/2] Sort the imports
95
96---
97 Lib/ufo2ft/filters/cubicToQuadratic.py | 2 +-
98 tests/preProcessor_test.py | 2 +-
99 2 files changed, 2 insertions(+), 2 deletions(-)
100
101diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py
102index 4b77144..5f28ea4 100644
103--- a/Lib/ufo2ft/filters/cubicToQuadratic.py
104+++ b/Lib/ufo2ft/filters/cubicToQuadratic.py
105@@ -1,7 +1,7 @@
106 import logging
107
108-from fontTools.pens.cu2quPen import Cu2QuPointPen
109 from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR
110+from fontTools.pens.cu2quPen import Cu2QuPointPen
111
112 from ufo2ft.filters import BaseFilter
113 from ufo2ft.fontInfoData import getAttrWithFallback
114diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py
115index bc32d55..41c579c 100644
116--- a/tests/preProcessor_test.py
117+++ b/tests/preProcessor_test.py
118@@ -2,8 +2,8 @@ import logging
119 import os
120
121 import pytest
122-from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY
123 from fontTools import designspaceLib
124+from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY
125
126 import ufo2ft
127 from ufo2ft.constants import (
128--
1292.36.1
130