Merge pull request #390 from fonttools/housekeeping

Housekeeping

Author: anthrotype

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - name: Lint
@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - name: Lint
@@ -40,13 +40,13 @@ jobs:
     runs-on: ${{ matrix.platform }}
     strategy:
       matrix:
-        python-version: ["3.8", "3.13"]
+        python-version: ["3.9", "3.13"]
         platform: [ubuntu-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install packages
@@ -86,7 +86,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
       - name: Install dependencies

pyproject.toml

@@ -17,7 +17,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
 ]
 urls = { Homepage = "https://github.com/fonttools/ufoLib2" }
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = ["attrs >= 22.1.0", "fonttools[ufo] >= 4.0.0"]
 dynamic = ["version"]
 
@@ -27,9 +27,9 @@ content-type = "text/markdown"
 
 [project.optional-dependencies]
 lxml = ["lxml"]
-converters = ["cattrs >= 24.1"]
-json = ["cattrs >= 24.1", "orjson ; platform_python_implementation != 'PyPy'"]
-msgpack = ["cattrs >= 24.1", "msgpack"]
+converters = ["cattrs >= 25.1.1"]
+json = ["cattrs >= 25.1.1", "orjson ; platform_python_implementation != 'PyPy'"]
+msgpack = ["cattrs >= 25.1.1", "msgpack"]
 
 [tool.setuptools]
 package-dir = { "" = "src" }
@@ -48,7 +48,7 @@ namespaces = false
 write_to = "src/ufoLib2/_version.py"
 
 [tool.black]
-target-version = ["py38"]
+target-version = ["py39"]
 
 [tool.isort]
 multi_line_output = 3
@@ -67,7 +67,7 @@ filterwarnings = [
 ]
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.9"
 disallow_incomplete_defs = true
 no_implicit_optional = true
 strict_optional = true

requirements-dev.txt

@@ -1,52 +1,61 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --python 3.8 requirements-dev.in
-black==24.8.0
+#    uv pip compile --universal --python 3.9 requirements-dev.in
+black==25.1.0
     # via -r requirements-dev.in
-click==8.1.7
+click==8.1.8 ; python_full_version < '3.10'
     # via black
-coverage==7.6.1
-    # via -r requirements-dev.in
-exceptiongroup==1.2.2
+click==8.2.1 ; python_full_version >= '3.10'
+    # via black
+colorama==0.4.6 ; sys_platform == 'win32'
     # via
-    #   -c requirements.txt
+    #   click
     #   pytest
-flake8==7.1.1
+coverage==7.9.1
+    # via -r requirements-dev.in
+exceptiongroup==1.3.0 ; python_full_version < '3.11'
+    # via pytest
+flake8==7.2.0
     # via -r requirements-dev.in
-iniconfig==2.0.0
+iniconfig==2.1.0
     # via pytest
-isort==5.13.2
+isort==6.0.1
     # via -r requirements-dev.in
 mccabe==0.7.0
     # via flake8
-mypy==1.13.0
+mypy==1.16.1
     # via -r requirements-dev.in
-mypy-extensions==1.0.0
+mypy-extensions==1.1.0
     # via
     #   black
     #   mypy
-packaging==24.1
+packaging==25.0
     # via
     #   black
     #   pytest
 pathspec==0.12.1
+    # via
+    #   black
+    #   mypy
+platformdirs==4.3.8
     # via black
-platformdirs==4.3.6
-    # via black
-pluggy==1.5.0
+pluggy==1.6.0
     # via pytest
-pycodestyle==2.12.1
+pycodestyle==2.13.0
     # via flake8
-pyflakes==3.2.0
+pyflakes==3.3.2
     # via flake8
-pytest==8.3.3
+pygments==2.19.1
+    # via pytest
+pytest==8.4.1
     # via -r requirements-dev.in
-tomli==2.0.2
+tomli==2.2.1 ; python_full_version < '3.11'
     # via
     #   black
     #   mypy
     #   pytest
-typing-extensions==4.12.2
+typing-extensions==4.14.0
     # via
     #   -c requirements.txt
     #   black
+    #   exceptiongroup
     #   mypy

requirements.txt

@@ -1,28 +1,30 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --all-extras --python 3.8 pyproject.toml
+#    uv pip compile --all-extras --universal --python 3.9 pyproject.toml
 appdirs==1.4.4
     # via fs
-attrs==24.2.0
+attrs==25.3.0
     # via
     #   ufolib2 (pyproject.toml)
     #   cattrs
-cattrs==24.1.2
+cattrs==25.1.1
     # via ufolib2 (pyproject.toml)
-exceptiongroup==1.2.2
+exceptiongroup==1.3.0 ; python_full_version < '3.11'
     # via cattrs
-fonttools==4.54.1
+fonttools==4.58.4
     # via ufolib2 (pyproject.toml)
 fs==2.4.16
     # via fonttools
-lxml==5.3.0
+lxml==5.4.0
     # via ufolib2 (pyproject.toml)
-msgpack==1.1.0
+msgpack==1.1.1
     # via ufolib2 (pyproject.toml)
-orjson==3.10.10
+orjson==3.10.18 ; platform_python_implementation != 'PyPy'
     # via ufolib2 (pyproject.toml)
-setuptools==75.3.0
+setuptools==80.9.0
     # via fs
-six==1.16.0
+six==1.17.0
     # via fs
-typing-extensions==4.12.2
-    # via cattrs
+typing-extensions==4.14.0
+    # via
+    #   cattrs
+    #   exceptiongroup

src/ufoLib2/objects/info/__init__.py

@@ -138,7 +138,7 @@ def _convert_WidthClass(value: int | None) -> WidthClass | None:
 
 
 def _convert_WoffMetadataExtensions(
-    values: Sequence[WoffMetadataExtension | Mapping[str, Any]] | None
+    values: Sequence[WoffMetadataExtension | Mapping[str, Any]] | None,
 ) -> list[WoffMetadataExtension] | None:
     return _convert_optional_list_of_dicts(WoffMetadataExtension, values)
 

src/ufoLib2/serde/util.py

@@ -10,7 +10,7 @@ def read_bytes(fp: PathLike | BinaryIO) -> bytes:
         fp = cast(BinaryIO, fp)
         return fp.read()
     else:
-        fp = cast(PathLike, fp)
+        fp = cast(PathLike, fp)  # type: ignore
         with open(fp, "rb") as f:
             return f.read()
 
@@ -20,6 +20,6 @@ def write_bytes(fp: PathLike | BinaryIO, data: bytes) -> None:
         fp = cast(BinaryIO, fp)
         fp.write(data)
     else:
-        fp = cast(PathLike, fp)
+        fp = cast(PathLike, fp)  # type: ignore
         with open(fp, "wb") as f:
             f.write(data)

tests/test_ufoLib2.py

@@ -241,7 +241,7 @@ def test_guidelines() -> None:
     ]
 
     # setter should clear existing guidelines
-    font.guidelines = [{"x": 100}, ufoLib2.objects.Guideline(y=20)]  # type: ignore
+    font.guidelines = [{"x": 100}, ufoLib2.objects.Guideline(y=20)]
 
     assert len(font.guidelines) == 2
     assert font.guidelines == [

tox.ini

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