From 8040efbea2d19fe12e362cf116174d0937e6f6af Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 19 Jul 2025 23:46:27 +0200
Subject: [PATCH] python3Packages.fonttools: 4.56.0 -> 4.59.0

- ufo extra no longer depends on fs
- python 3.14 change has been merged upstream
- test suite automatically skips tests that are missing dependencies in
  the test environment, so we don't need to maintain a list of them.
- issue with pytest >= 8.0.1 has been resolved upstream

https://github.com/fonttools/fonttools/releases/tag/4.57.0
https://github.com/fonttools/fonttools/releases/tag/4.58.0
https://github.com/fonttools/fonttools/releases/tag/4.58.1
https://github.com/fonttools/fonttools/releases/tag/4.58.2
https://github.com/fonttools/fonttools/releases/tag/4.58.3
https://github.com/fonttools/fonttools/releases/tag/4.58.4
https://github.com/fonttools/fonttools/releases/tag/4.58.5
https://github.com/fonttools/fonttools/releases/tag/4.59.0
---
 .../python-modules/fonttools/default.nix      | 26 +++----------------
 .../fonttools/python-3.13.4.patch             | 25 ------------------
 2 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/development/python-modules/fonttools/python-3.13.4.patch

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 42c64e016bf9..3c08366084f9 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,7 +7,6 @@
   fetchFromGitHub,
   setuptools,
   setuptools-scm,
-  fs,
   lxml,
   brotli,
   brotlicffi,
@@ -27,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "4.56.0";
+  version = "4.59.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,15 +35,9 @@ buildPythonPackage rec {
     owner = "fonttools";
     repo = "fonttools";
     tag = version;
-    hash = "sha256-ZkC1+I2d9wY9J7IoCGHGWG2gOVN7wW274UpN1lQxmJY=";
+    hash = "sha256-f3iedVwwh98XkFzPJ/+XZ2n4pcDXDoPlQki+neGVuXE=";
   };
 
-  patches = [
-    # https://github.com/fonttools/fonttools/pull/3855
-    # FIXME: remove when merged
-    ./python-3.13.4.patch
-  ];
-
   build-system = [
     setuptools
     setuptools-scm
@@ -53,7 +46,7 @@ buildPythonPackage rec {
   optional-dependencies =
     let
       extras = {
-        ufo = [ fs ];
+        ufo = [ ];
         lxml = [ lxml ];
         woff = [
           (if isPyPy then brotlicffi else brotli)
@@ -108,19 +101,6 @@ buildPythonPackage rec {
     "test_ttcompile_timestamp_calcs"
   ];
 
-  disabledTestPaths = [
-    # avoid test which depend on fs and matplotlib
-    # fs and matplotlib were removed to prevent strong cyclic dependencies
-    "Tests/misc/plistlib_test.py"
-    "Tests/pens"
-    "Tests/ufoLib"
-
-    # test suite fails with pytest>=8.0.1
-    # https://github.com/fonttools/fonttools/issues/3458
-    "Tests/ttLib/woff2_test.py"
-    "Tests/ttx/ttx_test.py"
-  ];
-
   meta = with lib; {
     homepage = "https://github.com/fonttools/fonttools";
     description = "Library to manipulate font files from Python";
diff --git a/pkgs/development/python-modules/fonttools/python-3.13.4.patch b/pkgs/development/python-modules/fonttools/python-3.13.4.patch
deleted file mode 100644
index c05def255b17..000000000000
--- a/pkgs/development/python-modules/fonttools/python-3.13.4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Lib/fontTools/feaLib/ast.py b/Lib/fontTools/feaLib/ast.py
-index efcce8c680..18e5a891d3 100644
---- a/Lib/fontTools/feaLib/ast.py
-+++ b/Lib/fontTools/feaLib/ast.py
-@@ -719,7 +719,8 @@ def __init__(self, prefix, glyphs, suffix, lookups, location=None):
-         for i, lookup in enumerate(lookups):
-             if lookup:
-                 try:
--                    (_ for _ in lookup)
-+                    for _ in lookup:
-+                        break
-                 except TypeError:
-                     self.lookups[i] = [lookup]
- 
-@@ -777,7 +778,8 @@ def __init__(self, prefix, glyphs, suffix, lookups, location=None):
-         for i, lookup in enumerate(lookups):
-             if lookup:
-                 try:
--                    (_ for _ in lookup)
-+                    for _ in lookup:
-+                        break
-                 except TypeError:
-                     self.lookups[i] = [lookup]
- 
-