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 --- Lib/ufo2ft/filters/cubicToQuadratic.py | 4 ++-- Lib/ufo2ft/preProcessor.py | 4 ++-- setup.py | 1 - tests/outlineCompiler_test.py | 2 +- tests/preProcessor_test.py | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py index 87d81b1..4b77144 100644 --- a/Lib/ufo2ft/filters/cubicToQuadratic.py +++ b/Lib/ufo2ft/filters/cubicToQuadratic.py @@ -1,7 +1,7 @@ import logging -from cu2qu.pens import Cu2QuPointPen -from cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR +from fontTools.pens.cu2quPen import Cu2QuPointPen +from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR from ufo2ft.filters import BaseFilter from ufo2ft.fontInfoData import getAttrWithFallback diff --git a/Lib/ufo2ft/preProcessor.py b/Lib/ufo2ft/preProcessor.py index e239152..9463aea 100644 --- a/Lib/ufo2ft/preProcessor.py +++ b/Lib/ufo2ft/preProcessor.py @@ -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 @@ -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 needs_decomposition = set() diff --git a/setup.py b/setup.py index d8d9982..a165ab1 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,6 @@ setup( tests_require=["pytest>=2.8"], install_requires=[ "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 b31319c..ee51920 100644 --- a/tests/outlineCompiler_test.py +++ b/tests/outlineCompiler_test.py @@ -2,7 +2,7 @@ import logging import os import pytest -from cu2qu.ufo import font_to_quadratic +from fontTools.cu2qu.ufo import font_to_quadratic from fontTools.ttLib import TTFont 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 11196f8..bc32d55 100644 --- a/tests/preProcessor_test.py +++ b/tests/preProcessor_test.py @@ -2,7 +2,7 @@ import logging import os import pytest -from cu2qu.ufo import CURVE_TYPE_LIB_KEY +from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY from fontTools import designspaceLib import ufo2ft -- 2.36.1 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 --- Lib/ufo2ft/filters/cubicToQuadratic.py | 2 +- tests/preProcessor_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py index 4b77144..5f28ea4 100644 --- a/Lib/ufo2ft/filters/cubicToQuadratic.py +++ b/Lib/ufo2ft/filters/cubicToQuadratic.py @@ -1,7 +1,7 @@ import logging -from fontTools.pens.cu2quPen import Cu2QuPointPen from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR +from fontTools.pens.cu2quPen import Cu2QuPointPen from ufo2ft.filters import BaseFilter from ufo2ft.fontInfoData import getAttrWithFallback diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py index bc32d55..41c579c 100644 --- a/tests/preProcessor_test.py +++ b/tests/preProcessor_test.py @@ -2,8 +2,8 @@ import logging import os import pytest -from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY from fontTools import designspaceLib +from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY import ufo2ft from ufo2ft.constants import ( -- 2.36.1