From 7eacba5b6395dbdaed849944fd415ac5dfe02880 Mon Sep 17 00:00:00 2001
From: Marc Foley <m.foley.88@gmail.com>
Date: Tue, 28 May 2024 16:03:27 +0100
Subject: [PATCH 1/2] Upgrade fonttools

---
 pyproject.toml           | 2 +-
 src/diffenator2/jfont.py | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index daa00fa..4ea2609 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ source = "git-tag"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
-fontTools = { version = ">=4.37.3", extras = ["ufo"] }
+fontTools = { version = ">=4.52.1", extras = ["ufo"] }
 jinja2 = "*"
 Pillow = "*"
 glyphsets = ">=0.6.5"
diff --git a/src/diffenator2/jfont.py b/src/diffenator2/jfont.py
index 70d1ec8..cfbac26 100644
--- a/src/diffenator2/jfont.py
+++ b/src/diffenator2/jfont.py
@@ -166,11 +166,6 @@ def serialise_glyph(obj, root):
             f"Component {i}: {c.glyphName}": serialise_component(c)
             for i, c in enumerate(obj.components)
         }
-    elif obj.isVarComposite():
-        return {
-            f"Component {i}: {c.glyphName}": serialise_component(c)
-            for i, c in enumerate(obj.components)
-        }
     else:
         last = 0
         contours = {}

From 8ca42bfafb7f49ec8b55980e1d5d095467aadd2e Mon Sep 17 00:00:00 2001
From: Marc Foley <m.foley.88@gmail.com>
Date: Tue, 28 May 2024 16:19:20 +0100
Subject: [PATCH 2/2] fix gha

---
 .github/workflows/test.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a93d8ac..fac4011 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,17 +8,12 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.platform }}
     strategy:
       matrix:
         # test on same versions as fonttools
         python-version: ["3.10"]
-        platform: [ubuntu-latest, macos-latest, windows-latest]
-        exclude: # Only test on the latest supported stable Python on macOS and Windows.
-          - platform: macos-latest
-            python-version: 3.10
-          - platform: windows-latest
-            python-version: 3.10
+        platform: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}