From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8NXYEMDp0GH/9AAAgWs5BA (envelope-from ) for ; Sun, 02 Jan 2022 00:54:40 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id gGgiDsDp0GGmNgAA9RJhRA (envelope-from ) for ; Sun, 02 Jan 2022 00:54:40 +0100 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 3F0A826E2F for ; Sun, 2 Jan 2022 00:54:39 +0100 (CET) Received: from localhost ([::1]:43688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n3oCs-0006sx-Du for larch@yhetil.org; Sat, 01 Jan 2022 18:54:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3oBN-0005VV-Lo for guix-patches@gnu.org; Sat, 01 Jan 2022 18:53:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3oBN-0008Ap-Ab for guix-patches@gnu.org; Sat, 01 Jan 2022 18:53:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n3oBN-00038Z-9F for guix-patches@gnu.org; Sat, 01 Jan 2022 18:53:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#50505] [PATCH v3 09/12] 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: Sat, 01 Jan 2022 23:53:05 +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?= , Xinglu Chen , Liliana Marie Prikler Received: via spool by 50505-submit@debbugs.gnu.org id=B50505.164108116011940 (code B ref 50505); Sat, 01 Jan 2022 23:53:05 +0000 Received: (at 50505) by debbugs.gnu.org; 1 Jan 2022 23:52:40 +0000 Received: from localhost ([127.0.0.1]:59599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3oAs-00035x-3Q for submit@debbugs.gnu.org; Sat, 01 Jan 2022 18:52:40 -0500 Received: from out1.mail.ruhr-uni-bochum.de ([134.147.53.149]:55310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3oAp-00035E-07 for 50505@debbugs.gnu.org; Sat, 01 Jan 2022 18:52:31 -0500 Received: from mx1.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by out1.mail.ruhr-uni-bochum.de (Postfix mo-ext) with ESMTP id 4JRJhn3tR1z8S68; Sun, 2 Jan 2022 00:52:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ruhr-uni-bochum.de; s=mail-2017; t=1641081145; bh=q3DF6xd1BziDgdLWPM+dasjZREJStZv2eAtqv1WHnNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dBM5aKVo8LTfT+4swQrw5APv2Z55blOYU/R58oiZWGlirKhXwPeedJrWHXML0ijuD T2NlzomGmnGrVMrOZslwQJE4Kov+ZXcPnyRkcSiV6P/5OjiEDgg10nbiQgZNSA9IY1 maDQ7yImGj9QnM30g7Gy4tzGvFRdeOwRrLQWJQ70= Received: from out1.mail.ruhr-uni-bochum.de (localhost [127.0.0.1]) by mx1.mail.ruhr-uni-bochum.de (Postfix idis) with ESMTP id 4JRJhn3GHMz8S5l; Sun, 2 Jan 2022 00:52:25 +0100 (CET) X-Envelope-Sender: X-RUB-Notes: Internal origin=134.147.42.236 Received: from mail2.mail.ruhr-uni-bochum.de (mail2.mail.ruhr-uni-bochum.de [134.147.42.236]) by out1.mail.ruhr-uni-bochum.de (Postfix mi-int) with ESMTP id 4JRJhn29n2z8S43; Sun, 2 Jan 2022 00:52:25 +0100 (CET) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.104.1 at mx1.mail.ruhr-uni-bochum.de Received: from think.local (dslb-002-204-223-044.002.204.pools.vodafone-ip.de [2.204.223.44]) by mail2.mail.ruhr-uni-bochum.de (Postfix) with ESMTPSA id 4JRJhn09DlzDgyf; Sun, 2 Jan 2022 00:52:25 +0100 (CET) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.104.1 at mail2.mail.ruhr-uni-bochum.de Date: Sun, 2 Jan 2022 00:51:52 +0100 Message-Id: <20220101235155.5754-10-daniel.meissner-i4k@ruhr-uni-bochum.de> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220101235155.5754-1-daniel.meissner-i4k@ruhr-uni-bochum.de> References: <20220101235155.5754-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: , =?utf-8?q?Daniel_Mei=C3=9Fner_via_Guix-patches?= From: =?utf-8?q?Daniel_Mei=C3=9Fner_via_Guix-patches?= via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641081279; 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=Lo2tyljiulWLHGdMKA/sIs0Gytru9nTpQHTRP78VgHc=; b=Ku4OchCXeXfC060UmTlAhyatTi/UKtEteZNfAcXsRcdcvlKhwBUj4ygv1ZjioHqSZc5CpW Yx+7iOsu0qsltdID6uzRGQxlgu+pCJdYnDsq1uKgAESRplEe0maZdWg0P57849rkDoStGA jfIHH/7oQdTkNspQv2DBypSfYtx6X3Hb1+TIQHkuwolAUdCdfkQGbSSsq/KigrERQvbG8a NIP1r9PT8V4Y0bLxvau1PFhGc/L5a+yYBcweYy8zl1jR+6IHbyLzq23gJkOp1q/yykb4di i5OLuuFfZ/olTqYjIOJZgU9BE1bwsheU7FF8jwKivWR7z5Lfz58deo3kpm9o2g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641081279; a=rsa-sha256; cv=none; b=MvklCivwQMwmCe8Q0fC1ItoxFWXBZk5NN4zkxckkq9yRDwtamxi/92R9r/jrifl9ndhPCm 5Wv3NRRSnkCqi2Q/prrpp5I0NVxRNLujAM6VGLyi/UJRlN29ihisx3bgI5Iai+cixDw2vP FlF7iVzkdG7HLv9zvhVI/vsRi7S1xU0uuNJmpUlZ3ZtWV1Xb69uFhfO8qTzaS8Z2xMzfV7 vP3hPdJ0LUAwFjKwblUuXEa3atbW7Qb9Nsrco8tR+rkR7y4MwQpTRJrcmo/1hWhNDVjORy tzISweTEfgISw/YXkESQyycFQOdt3FrtrvoulSPUTOZim8rAfODovSUuJPO7ow== 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=dBM5aKVo; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.48 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ruhr-uni-bochum.de header.s=mail-2017 header.b=dBM5aKVo; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 3F0A826E2F X-Spam-Score: -2.48 X-Migadu-Scanner: scn1.migadu.com X-TUID: 5XmBGLD+920f * 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 | 26 +++ 3 files changed, 200 insertions(+) create mode 100644 gnu/packages/patches/python-manimpango-remove-manim-dep.patch diff --git a/gnu/local.mk b/gnu/local.mk index ff3e80ea68..c5fe7d87b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -47,6 +47,7 @@ # Copyright © 2021 Dmitry Polyakov # Copyright © 2021 Andrew Tropin # Copyright © 2021 Simon Tournier +# Copyright © 2021 Daniel Meißner # # This file is part of GNU Guix. # @@ -1683,6 +1684,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-magic-python-bytecode.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 65f1dbf014..61628ec956 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -39,6 +39,7 @@ (define-module (gnu packages python-science) #: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) @@ -1037,3 +1038,28 @@ (define-public python-modin 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 + (list pkg-config python-cython python-pytest)) + (inputs + (list 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.34.0