[gentoo-commits] repo/gentoo:master commit in: dev-python/fonttools/files/, dev-python/fonttools/

[gentoo-commits] repo/gentoo:master commit in: dev-python/fonttools/files/, dev-python/fonttools/

[Ionen Wolkens]

commit:     628d87bebc93e1344a1a61e4aba535b46a032ce0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 12:21:44 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 12:22:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=628d87be

dev-python/fonttools: enable py3.11

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/fonttools-4.33.3-py3.11-tests.patch      | 40 ++++++++++++++++++++++
 dev-python/fonttools/fonttools-4.33.3.ebuild       |  6 +++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/dev-python/fonttools/files/fonttools-4.33.3-py3.11-tests.patch b/dev-python/fonttools/files/fonttools-4.33.3-py3.11-tests.patch
new file mode 100644
index 000000000000..9b5e9983ba3d
--- /dev/null
+++ b/dev-python/fonttools/files/fonttools-4.33.3-py3.11-tests.patch
@@ -0,0 +1,40 @@
+https://github.com/fonttools/fonttools/pull/2655/commits/7787525b
+From: Parag Nemade <pnemade@fedoraproject.org>
+Date: Wed, 15 Jun 2022 18:24:04 +0530
+Subject: [PATCH] Fix tests for Python 3.11
+--- a/Tests/pens/cu2quPen_test.py
++++ b/Tests/pens/cu2quPen_test.py
+@@ -12,6 +12,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
++import sys
+ import unittest
+ 
+ from fontTools.pens.cu2quPen import Cu2QuPen, Cu2QuPointPen
+@@ -257,8 +258,12 @@ def test_ignore_single_points(self):
+         quadpen.closePath()
+ 
+         self.assertGreaterEqual(len(log.records), 1)
+-        self.assertIn("ignore_single_points is deprecated",
+-                      log.records[0].args[0])
++        if sys.version_info < (3, 11):
++            self.assertIn("ignore_single_points is deprecated",
++                          log.records[0].args[0])
++        else:
++            self.assertIn("ignore_single_points is deprecated",
++                          log.records[0].msg)
+ 
+         # single-point contours were ignored, so the pen commands are empty
+         self.assertFalse(pen.commands)
+--- a/Tests/ufoLib/ufoLib_test.py
++++ b/Tests/ufoLib/ufoLib_test.py
+@@ -35,7 +35,7 @@ def test_formatVersionTuple(ufo_path):
+     assert reader.formatVersionTuple == (3, 0)
+     assert reader.formatVersionTuple.major == 3
+     assert reader.formatVersionTuple.minor == 0
+-    assert str(reader.formatVersionTuple) == "3.0"
++    assert str(reader.formatVersionTuple) in ("3.0", "UFOFormatVersion.FORMAT_3_0")
+ 
+ 
+ def test_readMetaInfo_errors(ufo_path):

diff --git a/dev-python/fonttools/fonttools-4.33.3.ebuild b/dev-python/fonttools/fonttools-4.33.3.ebuild
index 804bd0d8369f..1576313a716a 100644
--- a/dev-python/fonttools/fonttools-4.33.3.ebuild
+++ b/dev-python/fonttools/fonttools-4.33.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 virtualx
@@ -28,6 +28,10 @@ BDEPEND="${RDEPEND}
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py3.11-tests.patch
+)
+
 python_prepare_all() {
 	# When dev-python/pytest-shutil is installed, we get weird import errors.
 	# This is due to incomplete nesting in the Tests/ tree:

[gentoo-commits] repo/gentoo:master commit in: dev-python/fonttools/files/, dev-python/fonttools/

[Michał Górny]

commit:     b6e1505025f4180520e91f0f7f43b15a170acd59
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 05:45:09 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 07:06:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e15050

dev-python/fonttools: Revert "add pypy3 to PYTHON_COMPAT"

The patch no longer applies to 4.39.0, and there are no revdeps right
now, so let's revert it until it is upstreamed properly.

Reverts: 7d043cbaeda9ad1128fe8130ca31738371e02233
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../fonttools/files/fonttools-4.38.0-pypy3.patch   | 34 -----------
 dev-python/fonttools/fonttools-4.38.0-r1.ebuild    | 70 ----------------------
 2 files changed, 104 deletions(-)

diff --git a/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch b/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch
deleted file mode 100644
index 4a85cde3891e..000000000000
--- a/dev-python/fonttools/files/fonttools-4.38.0-pypy3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-url: https://github.com/fonttools/fonttools/issues/2996
-
-commit ca9d98d94c3ba98db934f0d1e3a77134171f2262
-Author: Jérôme Carretero <cJ-gentoo@zougloub.eu>
-Date:   Fri Feb 17 19:24:46 2023 -0500
-
-    Fixup pypy3 compatibility
-
-diff --git a/Lib/fontTools/misc/macCreatorType.py b/Lib/fontTools/misc/macCreatorType.py
-index 6b191054b..f680f238d 100644
---- a/Lib/fontTools/misc/macCreatorType.py
-+++ b/Lib/fontTools/misc/macCreatorType.py
-@@ -24,7 +24,7 @@ def getMacCreatorAndType(path):
- 	"""
- 	if xattr is not None:
- 		try:
--			finderInfo = xattr.getxattr(path, 'com.apple.FinderInfo')
-+			finderInfo = xattr.getxattr(str(path), 'com.apple.FinderInfo')
- 		except (KeyError, IOError):
- 			pass
- 		else:
-diff --git a/Lib/fontTools/subset/svg.py b/Lib/fontTools/subset/svg.py
-index 4ed2cbd20..4a8823928 100644
---- a/Lib/fontTools/subset/svg.py
-+++ b/Lib/fontTools/subset/svg.py
-@@ -77,7 +77,7 @@ def iter_referenced_ids(tree: etree.Element) -> Iterator[str]:
- 
-         attrs = el.attrib
-         if "style" in attrs:
--            attrs = {**attrs, **parse_css_declarations(el.attrib["style"])}
-+            attrs = {**dict(attrs), **dict(parse_css_declarations(el.attrib["style"]))}
-         for attr in ("fill", "clip-path"):
-             if attr in attrs:
-                 value = attrs[attr]

diff --git a/dev-python/fonttools/fonttools-4.38.0-r1.ebuild b/dev-python/fonttools/fonttools-4.38.0-r1.ebuild
deleted file mode 100644
index d401fb8fb46d..000000000000
--- a/dev-python/fonttools/fonttools-4.38.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="
-	https://github.com/fonttools/fonttools/
-	https://pypi.org/project/fonttools/
-"
-SRC_URI="
-	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/fonttools-4.38.0-pypy3.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-python/fonttools/files/, dev-python/fonttools/

[Michał Górny]

commit:     35009ce0293f717503c8d41f7db9b81593d34a63
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 04:09:24 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 06:13:22 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35009ce0

dev-python/fonttools: Bump to 4.58.2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/fonttools/Manifest                      |  1 +
 .../fonttools/files/fonttools-4.58.2-py313.patch   | 42 ++++++++++++
 dev-python/fonttools/fonttools-4.58.2.ebuild       | 74 ++++++++++++++++++++++
 3 files changed, 117 insertions(+)

diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 9a83081ab985..2f26d10793ca 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -2,3 +2,4 @@ DIST fonttools-4.56.0.gh.tar.gz 3900744 BLAKE2B f75ad562092cadbf2a844fedf47e1b05
 DIST fonttools-4.57.0.gh.tar.gz 3932468 BLAKE2B 7bfcf6aa3b5cffbba7cdabe14a580dc40677a1d80a2d69750925d7e06c1885df9cd586a228c0d06707acdc9870e92241cce373f0eb27f93a4f887ba14631470c SHA512 7e3ef7149b8e6af5953a827e0a078390e67b919ba9752a03672d876f6de3d0d395b2e061c0f87e5d9298c13c74a1f0162d99151c364dfab487eec2ab9adced75
 DIST fonttools-4.58.0.gh.tar.gz 3955467 BLAKE2B 0094284f90685a4e8051c84374325413269ab0207f0ecc25d3129776a226de05a82adcbf1812cc3f18b8950b49f310f7a96295812a33c8e3fecd6aa48d768efb SHA512 8d32cffb2a83b0fb2eda89a8352b7e235595c8d159adb4075941da46c3715701c1d12d0f5e0fe663c587f5c888658ab1d7b2a54cb857355848627a1c25acd0ae
 DIST fonttools-4.58.1.gh.tar.gz 3959551 BLAKE2B bb3a958a359654bee709efe8d21c6e7f13c62c730aa33fdcbe2866318fe91f14ee7e6b63951f17b5ff1faa3e2b96ee934bd7e5b063242d88980d649653a682ce SHA512 f5b810668dca7ffca943fc362616784d1aecbd8f036925b2f8acb2d80997c26cf8c8127814f31f1a62bcf062d83c4a8b76ee022a146d5c2b8693cd1750732545
+DIST fonttools-4.58.2.gh.tar.gz 3964058 BLAKE2B 0e367e65cd19d109db11e81020814b3b07dd7fb82068fd162ad04a7a7ee64d641991908c946f09f853b6e797b09f87bafb8870ab84750cc3d3e525083946d5d5 SHA512 f78026457be3d75be89ec6788309fc5cab9d9987b5c438bffe7059a78b5d688b6fb9a94dca9636f4c28d44a60f36cdd24bbdf1d32197d63e79b99f3108ce32a5

diff --git a/dev-python/fonttools/files/fonttools-4.58.2-py313.patch b/dev-python/fonttools/files/fonttools-4.58.2-py313.patch
new file mode 100644
index 000000000000..f4afa98b65ea
--- /dev/null
+++ b/dev-python/fonttools/files/fonttools-4.58.2-py313.patch
@@ -0,0 +1,42 @@
+From c9d720cfeb4e5bdabbed68050154f7f9486eac37 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 7 Jun 2025 07:51:13 +0200
+Subject: [PATCH] fix iterable check for Python 3.13.4 and newer
+
+Fix the `feaLib/ast.py` snippet used to check whether a type is iterable
+to work correctly with Python 3.13.4.  The snippet wrongly assumed
+that a generator expression will raise immediately when the RHS of `in`
+is not iterable.  This is no longer the case with Python 3.13.4,
+and such a generator only raises when you actually start iterating.
+Use a plain `for` expression to start iterating and catch the problem
+more reliably.
+
+Fixes #3854
+---
+ Lib/fontTools/feaLib/ast.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Lib/fontTools/feaLib/ast.py b/Lib/fontTools/feaLib/ast.py
+index efcce8c68..18e5a891d 100644
+--- a/Lib/fontTools/feaLib/ast.py
++++ b/Lib/fontTools/feaLib/ast.py
+@@ -719,7 +719,8 @@ class ChainContextPosStatement(Statement):
+         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 @@ class ChainContextSubstStatement(Statement):
+         for i, lookup in enumerate(lookups):
+             if lookup:
+                 try:
+-                    (_ for _ in lookup)
++                    for _ in lookup:
++                        break
+                 except TypeError:
+                     self.lookups[i] = [lookup]
+ 

diff --git a/dev-python/fonttools/fonttools-4.58.2.ebuild b/dev-python/fonttools/fonttools-4.58.2.ebuild
new file mode 100644
index 000000000000..6754ed213b4b
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.58.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3_11 python3_{11..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="
+	https://github.com/fonttools/fonttools/
+	https://pypi.org/project/fonttools/
+"
+SRC_URI="
+	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+RDEPEND="
+	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/fonttools/fonttools/pull/3855
+	"${FILESDIR}/${P}-py313.patch"
+)
+
+python_compile() {
+	local -x FONTTOOLS_WITH_CYTHON=$(usex native-extensions)
+	[[ ${EPYTHON} == pypy3 ]] && FONTTOOLS_WITH_CYTHON=0
+	distutils-r1_python_compile
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# flaky test
+		Tests/ttLib/woff2_test.py::WOFF2ReaderTest::test_get_normal_tables
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest \
+		-p rerunfailures --reruns=5 \
+		Tests fontTools || die -n "Tests failed with ${EPYTHON}"
+}