From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ILh2GlARQmEU6QAAgWs5BA (envelope-from ) for ; Wed, 15 Sep 2021 17:29:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id iI4jFlARQmF0MgAAB5/wlQ (envelope-from ) for ; Wed, 15 Sep 2021 15:29:20 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B9253F950 for ; Wed, 15 Sep 2021 17:29:19 +0200 (CEST) Received: from localhost ([::1]:50276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQWqc-0006eQ-UN for larch@yhetil.org; Wed, 15 Sep 2021 11:29:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQWqN-0006bn-7L for guix-patches@gnu.org; Wed, 15 Sep 2021 11:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41422) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQWqM-0001xf-Ty for guix-patches@gnu.org; Wed, 15 Sep 2021 11:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQWqM-0001TP-GW for guix-patches@gnu.org; Wed, 15 Sep 2021 11:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50505] [PATCH v2 10/13] gnu: Add python-manimpango. Resent-From: Daniel =?UTF-8?Q?Mei=C3=9Fner?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Sep 2021 15:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50505 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50505@debbugs.gnu.org Cc: Daniel =?UTF-8?Q?Mei=C3=9Fner?= Received: via spool by 50505-submit@debbugs.gnu.org id=B50505.16317196995592 (code B ref 50505); Wed, 15 Sep 2021 15:29:02 +0000 Received: (at 50505) by debbugs.gnu.org; 15 Sep 2021 15:28:19 +0000 Received: from localhost ([127.0.0.1]:52955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQWpQ-0001Qh-Ey for submit@debbugs.gnu.org; Wed, 15 Sep 2021 11:28:19 -0400 Received: from out3.mail.ruhr-uni-bochum.de ([134.147.53.155]:18947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQWp9-0001Nw-Ji for 50505@debbugs.gnu.org; Wed, 15 Sep 2021 11:27:52 -0400 Received: from mx3.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by out3.mail.ruhr-uni-bochum.de (Postfix mo-ext) with ESMTP id 4H8kcG1Jk0z8S89 for <50505@debbugs.gnu.org>; Wed, 15 Sep 2021 17:27:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ruhr-uni-bochum.de; s=mail-2017; t=1631719662; bh=aZldWG/e2wPSAqR0IBDxq/80PX6ukhN2RDr1dzsGM5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hRHjZTJlK7w8Ph1Y86YFndDwMai9B2wnT+9ngX62tVziinLFgakl8kKZL7L4QOlo+ f/klw+B6oRnKlxYM8z1/6vnHGVjFiHYjYYN4KH8K0SS7k66nOq0oqrdX2+OZGIA7xS ecg8O9XYQ0un8CfL+xhv/LCKktC5ZpaUKfDdXt9c= Received: from out3.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by mx3.mail.ruhr-uni-bochum.de (Postfix idis) with ESMTP id 4H8kcG0hvyz8S44; Wed, 15 Sep 2021 17:27:42 +0200 (CEST) X-Envelope-Sender: X-RUB-Notes: Internal origin=IPv6:2a05:3e00:c:1001::8693:2aec Received: from mail2.mail.ruhr-uni-bochum.de (mail2.mail.ruhr-uni-bochum.de [IPv6:2a05:3e00:c:1001::8693:2aec]) by out3.mail.ruhr-uni-bochum.de (Postfix mi-int) with ESMTP id 4H8kcF6Mvjz8S6T; Wed, 15 Sep 2021 17:27:41 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.1 at mx3.mail.ruhr-uni-bochum.de Received: from xii-04.mg07.ruhr-uni-bochum.de (pm26.mg07.ruhr-uni-bochum.de [10.150.49.41]) by mail2.mail.ruhr-uni-bochum.de (Postfix) with ESMTPSA id 4H8kcF4csszDgyY; Wed, 15 Sep 2021 17:27:41 +0200 (CEST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.0 at mail2.mail.ruhr-uni-bochum.de Date: Wed, 15 Sep 2021 17:25:16 +0200 Message-Id: <20210915152519.25572-11-daniel.meissner-i4k@ruhr-uni-bochum.de> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210910112231.6411-1-daniel.meissner-i4k@ruhr-uni-bochum.de> References: <20210910112231.6411-1-daniel.meissner-i4k@ruhr-uni-bochum.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Daniel =?UTF-8?Q?Mei=C3=9Fner?= X-ACL-Warn: , Daniel =?UTF-8?Q?Mei=C3=9Fner?= via Guix-patches From: Daniel =?UTF-8?Q?Mei=C3=9Fner?= via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631719759; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=XOs6dQBFAFPD5DzSY5N7Oe8ii8w25VqAhuG5p340oWk=; b=gUhPdmzBegSPGykt4w0FSvkQQEJhnLniCKtVITwCThwzwcFoOJogl+AiCAa2T2HqjlJ1jG qbewuF/YK+z14zE/em5MzorsEyIrcDzgNmVdjLbdl6fX8u35F0BnMJgj8+GTzuZFGaN5Ox CQVjpx3ILAKbxgnB4cF/TA8TIGi9YWLoG5JAzk+mKUvLix6gZoRGxBHssDd9ttqO2ISh5o xg+j5WPJ6Y5TYpCSI0FGbhPTk6GLnl8MdFEy0OY4D3WyksXk3xFl70OXiA+PY8qeB9e8G2 Jb+/bmIrVZnSJocfLJOvoCEX8JQ+/HTYMOYgfJhtLkcIl2Vadki0aL+S/iLWSw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631719759; a=rsa-sha256; cv=none; b=RLo23JNqqAsVMFqeBsNMXz5j7OdpxpZYU7XZ3EB89I538EXZkwNDYoRQZfR9xKAVqk4OFk SPoqGOWNxwVYW3KDAHUWi2o+nyEsWMhvm21FLcBustMYgGrf+qmOuV9190qx/ubCiWU7oS K7rywzd42wZq+sSnNNQQCnuXEcKTVsZZujwZ/EQoa9Dbxu42bphQjPi+GbVZuHJKfDOnKH 1onK3JOqwRjajmzcH7oqfM8nKg0YMvvf63ON8YnkNJNkMyCekfDI+nMKjl5pgDUB3vKNbg HYTRNOUh5SJdaoMIcFHRmZv0rN5iYRDhmLr5TsCcuedgoE/F4cktjipQbDkE+g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ruhr-uni-bochum.de header.s=mail-2017 header.b=hRHjZTJl; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.90 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ruhr-uni-bochum.de header.s=mail-2017 header.b=hRHjZTJl; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: B9253F950 X-Spam-Score: -2.90 X-Migadu-Scanner: scn0.migadu.com X-TUID: zTHNvuxhfMYy * gnu/packages/python-science.scm (python-manimpango): New variable. --- gnu/local.mk | 2 + .../python-manimpango-remove-manim-dep.patch | 172 ++++++++++++++++++ gnu/packages/python-science.scm | 28 +++ 3 files changed, 202 insertions(+) create mode 100644 gnu/packages/patches/python-manimpango-remove-manim-dep.patch diff --git a/gnu/local.mk b/gnu/local.mk index d738f97ca8..640b9e3b95 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -44,6 +44,7 @@ # Copyright © 2021 Arun Isaac # Copyright © 2021 Sharlatan Hellseher # Copyright © 2021 Dmitry Polyakov +# Copyright © 2021 Daniel Meißner # # This file is part of GNU Guix. # @@ -1646,6 +1647,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ + %D%/packages/patches/python-manimpango-remove-manim-dep.patch \ %D%/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-moderngl-window-skip-tests.patch \ diff --git a/gnu/packages/patches/python-manimpango-remove-manim-dep.patch b/gnu/packages/patches/python-manimpango-remove-manim-dep.patch new file mode 100644 index 0000000000..579c2302d8 --- /dev/null +++ b/gnu/packages/patches/python-manimpango-remove-manim-dep.patch @@ -0,0 +1,172 @@ +Fix dependency on manim for tests + +This fixes a circular dependency between manim and manimpango. + +Extracted from upstream: +https://github.com/ManimCommunity/ManimPango/commit/7e2b17aa14b10bd58af0598cc2de51a406682797 + +diff --git a/tests/_manim.py b/tests/_manim.py +index 3ea4676..b11d3e9 100644 +--- a/tests/_manim.py ++++ b/tests/_manim.py +@@ -2,11 +2,12 @@ + """This file contains helpers for the tests copied and modified + from Manim. + """ +- ++import copy + import os ++import re + from pathlib import Path + +-from manimpango import Alignment, MarkupUtils ++from manimpango import Alignment, MarkupUtils, TextSetting, text2svg + + + class MarkupText: +@@ -104,3 +105,115 @@ class MarkupText: + + def __repr__(self): + return f"MarkupText({repr(self.original_text)})" ++ ++ ++class Text: ++ def __init__( ++ self, ++ text: str, ++ fill_opacity: float = 1.0, ++ stroke_width: int = 0, ++ size: int = 1, ++ line_spacing: int = -1, ++ font: str = "", ++ slant: str = "NORMAL", ++ weight: str = "NORMAL", ++ gradient: tuple = None, ++ tab_width: int = 4, ++ disable_ligatures: bool = False, ++ filename: str = "text.svg", ++ **kwargs, ++ ) -> None: ++ self.size = size ++ self.filename = filename ++ self.line_spacing = line_spacing ++ self.font = font ++ self.slant = slant ++ self.weight = weight ++ self.gradient = gradient ++ self.tab_width = tab_width ++ self.original_text = text ++ self.disable_ligatures = disable_ligatures ++ text_without_tabs = text ++ self.t2f = self.t2s = self.t2w = {} ++ if text.find("\t") != -1: ++ text_without_tabs = text.replace("\t", " " * self.tab_width) ++ self.text = text_without_tabs ++ if self.line_spacing == -1: ++ self.line_spacing = self.size + self.size * 0.3 ++ else: ++ self.line_spacing = self.size + self.size * self.line_spacing ++ self.text2svg() ++ ++ def text2settings(self): ++ """Internally used function. Converts the texts and styles ++ to a setting for parsing.""" ++ settings = [] ++ t2x = [self.t2f, self.t2s, self.t2w] ++ for i in range(len(t2x)): ++ fsw = [self.font, self.slant, self.weight] ++ if t2x[i]: ++ for word, x in list(t2x[i].items()): ++ for start, end in self.find_indexes(word, self.text): ++ fsw[i] = x ++ settings.append(TextSetting(start, end, *fsw)) ++ # Set all text settings (default font, slant, weight) ++ fsw = [self.font, self.slant, self.weight] ++ settings.sort(key=lambda setting: setting.start) ++ temp_settings = settings.copy() ++ start = 0 ++ for setting in settings: ++ if setting.start != start: ++ temp_settings.append(TextSetting(start, setting.start, *fsw)) ++ start = setting.end ++ if start != len(self.text): ++ temp_settings.append(TextSetting(start, len(self.text), *fsw)) ++ settings = sorted(temp_settings, key=lambda setting: setting.start) ++ ++ if re.search(r"\n", self.text): ++ line_num = 0 ++ for start, end in self.find_indexes("\n", self.text): ++ for setting in settings: ++ if setting.line_num == -1: ++ setting.line_num = line_num ++ if start < setting.end: ++ line_num += 1 ++ new_setting = copy.copy(setting) ++ setting.end = end ++ new_setting.start = end ++ new_setting.line_num = line_num ++ settings.append(new_setting) ++ settings.sort(key=lambda setting: setting.start) ++ break ++ for setting in settings: ++ if setting.line_num == -1: ++ setting.line_num = 0 ++ return settings ++ ++ def text2svg(self): ++ """Internally used function. ++ Convert the text to SVG using Pango ++ """ ++ size = self.size * 10 ++ line_spacing = self.line_spacing * 10 ++ dir_name = Path(self.filename).parent ++ disable_liga = self.disable_ligatures ++ if not os.path.exists(dir_name): ++ os.makedirs(dir_name) ++ file_name = self.filename ++ settings = self.text2settings() ++ width = 600 ++ height = 400 ++ ++ return text2svg( ++ settings, ++ size, ++ line_spacing, ++ disable_liga, ++ file_name, ++ 30, ++ 30, ++ width, ++ height, ++ self.text, ++ ) +diff --git a/tests/test_fonts.py b/tests/test_fonts.py +index 51e7eb4..da42895 100644 +--- a/tests/test_fonts.py ++++ b/tests/test_fonts.py +@@ -3,13 +3,12 @@ import sys + from pathlib import Path + from shutil import copyfile + +-import manim + import pytest + + import manimpango + + from . import FONT_DIR +-from ._manim import MarkupText ++from ._manim import MarkupText, Text + + font_lists = { + (FONT_DIR / "AdobeVFPrototype.ttf").absolute(): "Adobe Variable Font Prototype", +@@ -38,7 +37,7 @@ def test_register_font(font_name): + @pytest.mark.parametrize("font_name", font_lists.values()) + def test_warning(capfd, font_name): + print(font_name) +- manim.Text("Testing", font=font_name) ++ Text("Testing", font=font_name) + captured = capfd.readouterr() + assert "Pango-WARNING **" not in captured.err, "Looks like pango raised a warning?" + +-- +2.32.0 diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index d3730fadcc..fcd983520c 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages gcc) + #:use-module (gnu packages gtk) #:use-module (gnu packages image-processing) #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) @@ -982,3 +983,30 @@ pandas notebooks, scripts, and libraries. Unlike other distributed DataFrame libraries, Modin provides seamless integration and compatibility with existing pandas code.") (license license:asl2.0))) + +(define-public python-manimpango + (package + (name "python-manimpango") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ManimPango" version)) + (sha256 + (base32 + "1j2mbhf7d82718nkc0r8x7cf35hlh13b67qkczjbbys3w24nyfsw")) + (patches (search-patches "python-manimpango-remove-manim-dep.patch")))) + (build-system python-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("Cython" ,python-cython) + ("python-pytest" ,python-pytest))) + (inputs + `(("pango" ,pango))) + (home-page "https://manimpango.manim.community/") + (synopsis + "Bindings for pango for use with Manim") + (description + "These are Python bindings for Pango to be used with the mathematical +animation software Manim.") + (license license:gpl3+))) -- 2.33.0