[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/

[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/

[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: