From f3b7e0eab5cb0e1bce37707bb344a87a0450d914 Mon Sep 17 00:00:00 2001 From: Skef Iterum Date: Thu, 27 Feb 2025 04:38:22 -0800 Subject: [PATCH] Update requirements update a couple of otfautohint tests to match newer fontTools releases --- pyproject.toml | 6 +-- requirements.txt | 16 +++--- .../braceleft.glif | 48 +++++++++++++----- .../braceright.glif | 19 +++++-- tests/otfautohint_data/input/dummy/font.ps | Bin 202308 -> 202340 bytes 5 files changed, 61 insertions(+), 28 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 20a174a2e..670937522 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,10 +28,10 @@ dependencies = [ "lxml >= 4.9.3", "booleanOperations >= 0.9.0", "defcon[lxml,pens] >= 0.10.3", - "fontMath >= 0.9.3", - "fontTools[unicode,woff,lxml,ufo] >= 4.43.0", + "fontMath >= 0.9.4", + "fontTools[unicode,woff,lxml,ufo] >= 4.55.0", "tqdm >= 4.66.1", - "ufonormalizer >= 0.6.1", + "ufonormalizer >= 0.6.2", "ufoProcessor >= 1.13.1", ] diff --git a/requirements.txt b/requirements.txt index a13f6d7e4..9026e32ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,11 +3,11 @@ # of our tools is stable # NOTE: hard-pinning (==) here gets relaxed to >= in pyproject.toml # NOTE: This list is currently duplicated in pyproject.toml -lxml>=4.9.3 -booleanOperations>=0.9.0 -defcon[lxml,pens]>=0.10.3 -fontMath>=0.9.3 -fontTools[unicode,woff,lxml,ufo]>=4.43.0 -tqdm>=4.66.1 -ufonormalizer>=0.6.1 -ufoProcessor>=1.13.1 +lxml==4.9.3 +booleanOperations==0.9.0 +defcon[lxml,pens]==0.10.3 +fontMath==0.9.4 +fontTools[unicode,woff,lxml,ufo]==4.55.0 +tqdm==4.66.1 +ufonormalizer==0.6.2 +ufoProcessor==1.13.1 diff --git a/tests/otfautohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceleft.glif b/tests/otfautohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceleft.glif index 0a634b517..ebc9464f9 100644 --- a/tests/otfautohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceleft.glif +++ b/tests/otfautohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceleft.glif @@ -11,20 +11,20 @@ - + - + - + - + @@ -33,17 +33,17 @@ - + - + - - + + - + @@ -75,7 +75,7 @@ hstem -121.6 37.6 hstem 201.6 41.6 hstem 528.8 37.6 - vstem 27.2 72 + vstem 96 51.2 @@ -86,7 +86,7 @@ hstem -121.6 37.6 hstem 201.6 41.6 hstem 528.8 37.6 - vstem 88.8 53.6 + vstem 96 51.2 @@ -97,7 +97,7 @@ hstem -121.6 37.6 hstem 201.6 41.6 hstem 528.8 37.6 - vstem 27.2 72 + vstem 88.8 53.6 @@ -108,7 +108,29 @@ hstem -121.6 37.6 hstem 201.6 41.6 hstem 528.8 37.6 - vstem 88.8 53.6 + vstem 96 51.2 + + + + pointTag + hintRef0005 + stems + + hstem -121.6 37.6 + hstem 201.6 41.6 + hstem 528.8 37.6 + vstem 27.2 72 + + + + pointTag + hintRef0006 + stems + + hstem -121.6 37.6 + hstem 201.6 41.6 + hstem 528.8 37.6 + vstem 96 51.2 diff --git a/tests/otfautohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceright.glif b/tests/otfautohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceright.glif index 10e4d0607..0d3ddd420 100644 --- a/tests/otfautohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceright.glif +++ b/tests/otfautohint_data/input/dummy/decimals.ufo/glyphs.com.adobe.type.processedglyphs/braceright.glif @@ -19,7 +19,7 @@ - + @@ -34,14 +34,14 @@ - + - + @@ -108,13 +108,24 @@ hstem -121.6 37.6 hstem 201.6 41.6 hstem 528.8 37.6 - vstem 96 50.4 + vstem 100 53.6 pointTag hintRef0005 stems + + hstem -121.6 37.6 + hstem 201.6 41.6 + hstem 528.8 37.6 + vstem 96 50.4 + + + + pointTag + hintRef0006 + stems hstem -121.6 37.6 hstem 201.6 41.6 diff --git a/tests/otfautohint_data/input/dummy/font.ps b/tests/otfautohint_data/input/dummy/font.ps index 6dc4669512077473f52509d02ca6b76c2fa513a3..2a1772b1fa05e0a9343335b4bae48fd07d98a6b3 100644 GIT binary patch delta 6825 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 WZ{VEO<3=mj+&FI?iu1NBg8mPO*2@(D