Add Python 3.14 support and remove 3.8 support

* Remove @cache substitute decorator since 3.8 is EOL

* Replace usages with 3.9's functools.cache

* Remove tests for functools.cache

* Update to Pillow 12.0.0

* Update the pyproject.toml's version tag info

* Update build script helpers to remove mention of 3.8

* Add 3.14 to the GitHub actions config for tests

Author: pushfoo

.github/workflows/test.yaml

@@ -25,7 +25,7 @@ jobs:
     # 2. Avoid forward referencing whenever possible
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
         architecture: ['x64']
         os: [ 'ubuntu-latest' ]
 

DOCKER.md

@@ -65,4 +65,4 @@ I've found two options:
 
 * [act][], a golang utility with some rough edges
 * Whatever [Red Hat is doing][] with a heavy-looking pair of JS-based repos
-  (haven't tried this)
+  (haven't tried this)

container.sh

@@ -2,6 +2,6 @@
 # Helper script to kick off install & run tests.
 
 # This is run separately from the main container build because it can
-# break before the test suite does under 3.8.
+# break before the test suite under some Python versions.
 python -m pip install -e .[dev]
-pytest tests
+pytest tests

fontknife/colors.py

@@ -1,3 +1,4 @@
+from functools import cache
 from typing import (
     Dict,
     FrozenSet,
@@ -9,7 +10,7 @@
 
 
 from fontknife.custom_types import ColorMode, ModeRGBA, ModeRGB, ModeL, Mode1, ModeAny
-from fontknife.utils import cache, steps
+from fontknife.utils import steps
 
 MODE_TO_BYTE_SIZE: Dict[ColorMode, int] = {
     ModeRGBA: 4,

fontknife/iohelpers.py

@@ -4,12 +4,13 @@
 from collections import deque
 from collections.abc import Mapping as MappingABC
 from contextlib import ExitStack
+from functools import cache
 from io import BytesIO, TextIOWrapper
 from pathlib import Path
 from typing import Optional, Tuple, Iterable, Union, Mapping, Callable, Any, BinaryIO, TypeVar
 
 from fontknife.custom_types import PathLike, HasReadline, HasWrite, PathLikeOrHasRead, HasRead, PathLikeOrHasStreamFunc
-from fontknife.utils import cache, value_of_first_attribute_present
+from fontknife.utils import value_of_first_attribute_present
 
 
 PairTypeStr = Tuple[type, str]

fontknife/octo/__init__.py

@@ -1,8 +1,9 @@
+from functools import cache
 from collections import deque
 from math import log
 from typing import Iterable, Optional
 
-from fontknife.utils import cache, ordered_calc_missing
+from fontknife.utils import ordered_calc_missing
 from fontknife.formats import RasterFont
 from fontknife.iohelpers import OutputHelper, padded_hex, exit_error
 from fontknife.custom_types import HasWrite, GlyphSequence, MissingGlyphError

fontknife/utils.py

@@ -7,7 +7,6 @@
 from typing import Iterable, Tuple, Dict, Optional, Any, Callable, Union, Mapping, overload, TypeVar, Hashable, \
     Pattern, Generator, MutableMapping, List, AbstractSet as SetABC
 from collections.abc import Mapping as MappingABC
-from functools import lru_cache as _lru_cache
 
 from PIL import Image, ImageDraw
 
@@ -21,12 +20,6 @@
 )
 
 
-# Compatibility: functools.cache was only added in 3.9
-# https://docs.python.org/3/library/functools.html#functools.cache
-def cache(fn: Callable):
-    return _lru_cache(maxsize=None)(fn)
-
-
 def dashes_to_underscores(s: str) -> str:
     return s.replace('-', '_')
 

pyproject.toml

@@ -16,6 +16,7 @@ classifiers=[
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Intended Audience :: Developers",
@@ -30,7 +31,7 @@ classifiers=[
         "Topic :: Software Development :: Libraries",
     ]
 dependencies = [
-    'Pillow~=11.1.0',
+    'Pillow~=12.0.0',
     'regex~=2024.11.6',  # Provides unicode grapheme support
     'typing_extensions',
     'types-regex~=2024.11.6.20241221'

test_in_docker.sh

@@ -33,10 +33,10 @@ error() {
 if [[  "$1" == '--help' ]]; then
   Usage
   exit 0
-elif [[ "$1" =~ ^3\.(8|9|10|11|12) ]]; then
+elif [[ "$1" =~ ^3\.(9|10|11|12|13|14) ]]; then
   PYTHON_VERSION="$1"
 else
-  error "Expected a PYTHON_VERSION or --help"
+  error "Expected a supported PYTHON_VERSION or --help"
   exit 1
 fi