Merge pull request #964 from googlefonts/drop-py39

Drop support for Python 3.9 EOL

Author: anthrotype

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
     strategy:
       matrix:
-        python-version: ["3.9", "3.13"]
+        python-version: ["3.10", "3.14"]
         platform: [ubuntu-latest, windows-latest]
     steps:
     - uses: actions/checkout@v4

Lib/ufo2ft/instantiator.py

@@ -54,7 +54,6 @@
 from fontTools import designspaceLib, ufoLib, varLib
 from fontTools.ttLib.tables._n_a_m_e import NameRecord as ftNameRecord
 from fontTools.ttLib.tables._n_a_m_e import _makeWindowsName
-from ufoLib2.objects.info import NameRecord as ufoNameRecord
 
 from ufo2ft.util import (
     _getNewGlyphFactory,
@@ -68,6 +67,9 @@
 
     from ufoLib2.objects import Font, Glyph, Info
 
+# Type alias for name records - can be dict (defcon) or NameRecord object (ufoLib2)
+NameRecordDict = Dict[str, Any]
+
 logger = logging.getLogger(__name__)
 
 # Use the same rounding function used by varLib to round things for the variable font
@@ -204,46 +206,53 @@ def process_rules_swaps(rules, location, glyphNames):
 
 
 def _override_name_record(
-    openTypeNameRecords: list[ufoNameRecord],
-    new_value: ufoNameRecord,
-) -> None:
-    """Override an existing name record in the list of OpenType name records."""
+    openTypeNameRecords: list,
+    new_value: NameRecordDict,
+) -> bool:
+    """Override an existing name record in the list of OpenType name records.
+
+    Records can be dicts (defcon) or NameRecord objects (ufoLib2). Both support
+    dict-style read access via []. For writing, dicts use [] while NameRecord
+    uses setattr since it's read-only for the Mapping interface.
+    """
     for record in openTypeNameRecords:
         if (
-            record.platformID == new_value.platformID
-            and record.encodingID == new_value.encodingID
-            and record.languageID == new_value.languageID
-            and record.nameID == new_value.nameID
+            record["platformID"] == new_value["platformID"]
+            and record["encodingID"] == new_value["encodingID"]
+            and record["languageID"] == new_value["languageID"]
+            and record["nameID"] == new_value["nameID"]
         ):
             # Override existing name record
-            record.string = new_value.string
+            if isinstance(record, dict):
+                record["string"] = new_value["string"]
+            else:
+                record.string = new_value["string"]
             return True
     return False
 
 
-def _make_ufo_name_record(
+def _make_name_record_dict(
     name_id: int,
     value: str,
     language_tag: str = "en",
-) -> None:
-    """Add a name to the list of OpenType name records, or override an existing one."""
+) -> NameRecordDict:
+    """Create a name record dict from name ID, value, and language tag."""
     temp_name_record: ftNameRecord = _makeWindowsName(value, name_id, language_tag)
-    new_name_record: ufoNameRecord = ufoNameRecord(
-        platformID=temp_name_record.platformID,
-        encodingID=temp_name_record.platEncID,
-        languageID=temp_name_record.langID,
-        nameID=temp_name_record.nameID,
-        string=value.strip(),
-    )
-    return new_name_record
+    return {
+        "platformID": temp_name_record.platformID,
+        "encodingID": temp_name_record.platEncID,
+        "languageID": temp_name_record.langID,
+        "nameID": temp_name_record.nameID,
+        "string": value.strip(),
+    }
 
 
 def merge_public_font_info(
     font: Font,
     override_public_font_info: Dict[str, Any],
     instance_location: Location,
 ) -> None:
-    """Merge the public.fontInfo dict into the ufoLib2.Font's info object (fontinfo.plist)."""
+    """Merge the public.fontInfo dict into the font's info object (fontinfo.plist)."""
     for key, value in override_public_font_info.items():
         try:
             if key == "openTypeNameRecords":
@@ -260,17 +269,17 @@ def merge_public_font_info(
 
                 # merge the existing openTypeNameRecords with the new ones
                 for dict_name_record in value:
-                    ufo_name_record = ufoNameRecord(
-                        platformID=dict_name_record["platformID"],
-                        encodingID=dict_name_record["encodingID"],
-                        languageID=dict_name_record["languageID"],
-                        nameID=dict_name_record["nameID"],
-                        string=dict_name_record["string"].strip(),
-                    )
+                    name_record = {
+                        "platformID": dict_name_record["platformID"],
+                        "encodingID": dict_name_record["encodingID"],
+                        "languageID": dict_name_record["languageID"],
+                        "nameID": dict_name_record["nameID"],
+                        "string": dict_name_record["string"].strip(),
+                    }
                     if not _override_name_record(
-                        font.info.openTypeNameRecords, ufo_name_record
+                        font.info.openTypeNameRecords, name_record
                     ):
-                        font.info.openTypeNameRecords.append(ufo_name_record)
+                        font.info.openTypeNameRecords.append(name_record)
             else:
                 setattr(font.info, key, copy.deepcopy(value))
         except AttributeError:
@@ -800,7 +809,7 @@ def _generate_instance_info(
             if language_tag in instance.localisedFamilyName:
                 # assume is Preferred Family Name (ID=16)
                 mulitlingual_opentype_font_records.append(
-                    _make_ufo_name_record(
+                    _make_name_record_dict(
                         OT_TYPOGRAPHIC_FAMILY_NAME_ID,
                         instance.localisedFamilyName[language_tag],
                         language_tag,
@@ -809,7 +818,7 @@ def _generate_instance_info(
             if language_tag in instance.localisedStyleName:
                 # assume is Preferred Subfamily Name (ID=17)
                 mulitlingual_opentype_font_records.append(
-                    _make_ufo_name_record(
+                    _make_name_record_dict(
                         OT_TYPOGRAPHIC_SUBFAMILY_NAME_ID,
                         instance.localisedStyleName[language_tag],
                         language_tag,
@@ -818,7 +827,7 @@ def _generate_instance_info(
             if language_tag in instance.localisedStyleMapFamilyName:
                 # Style Map Family Name (ID=1)
                 mulitlingual_opentype_font_records.append(
-                    _make_ufo_name_record(
+                    _make_name_record_dict(
                         OT_STYLE_MAP_FAMILY_NAME_ID,
                         instance.localisedStyleMapFamilyName[language_tag],
                         language_tag,
@@ -841,7 +850,7 @@ def _generate_instance_info(
                     # add style name to ID=1
                     full_family_name += " " + font.info.styleName
                 mulitlingual_opentype_font_records.append(
-                    _make_ufo_name_record(
+                    _make_name_record_dict(
                         OT_STYLE_MAP_FAMILY_NAME_ID,
                         full_family_name,
                         language_tag,
@@ -850,7 +859,7 @@ def _generate_instance_info(
             if language_tag in instance.localisedStyleMapStyleName:
                 # Style Map Subfamily Name (ID=2)
                 mulitlingual_opentype_font_records.append(
-                    _make_ufo_name_record(
+                    _make_name_record_dict(
                         OT_STYLE_MAP_STYLE_NAME_ID,
                         instance.localisedStyleMapStyleName[language_tag],
                         language_tag,

pyproject.toml

@@ -20,7 +20,6 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -35,7 +34,7 @@ dependencies = [
     "booleanoperations>=0.9.0",
     "cffsubr>=0.3.0",
     "fontmath>=0.9.4",
-    "fonttools[ufo]>=4.60.0",
+    "fonttools[ufo]>=4.61.1",
 ]
 description = "A bridge between UFOs and FontTools."
 dynamic = [
@@ -49,7 +48,7 @@ maintainers = [
     { email = "cosimo@anthrotype.com", name = "Cosimo Lupo" },
 ]
 name = "ufo2ft"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 [project.optional-dependencies]
 compreffor = [

requirements.txt

@@ -3,7 +3,7 @@ defcon==0.12.2
 compreffor==0.5.6
 booleanOperations==0.9.0
 cffsubr==0.3.0
-skia-pathops==0.8.0.post2
+skia-pathops==0.9.1
 fontMath==0.9.4
 
 # alternative UFO implementation

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = lint, py3{9,10,11,12,13}-cov, htmlcov
+envlist = lint, py3{10,11,12,13}-cov, htmlcov
 skip_missing_interpreters = true
 
 [testenv]