From nobody Tue Dec 21 19:43:13 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7557F1902C7B; Tue, 21 Dec 2021 19:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJRhS1PGjz4yjT; Tue, 21 Dec 2021 19:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F8A17BC0; Tue, 21 Dec 2021 19:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BLJhD3G028914; Tue, 21 Dec 2021 19:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLJhD91028913; Tue, 21 Dec 2021 19:43:13 GMT (envelope-from git) Date: Tue, 21 Dec 2021 19:43:13 GMT Message-Id: <202112211943.1BLJhD91028913@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: eaaf37ed752e - main - textproc/py-myst-parser: Allow build with py-markdown-it-py 2.0.0 and py-mdit-py-plugins 0.3.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eaaf37ed752ec6c4b2866ceccb244be35951c258 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640115801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pGiY9N7tTvIpDzUcwwTqoGyIk1J3nRtILBtP16x00aQ=; b=tW68pKlvvpzuGOjc2WCruPOvVUeVTiI+EC/uUvP105O6mROUzBPtBcO2KEHFhJ0jaEnaB6 THNAuGKJ77ef+vqpoDxrs/KJErjuGfQV63LTmaU8ykWKTW5ySUHSeU1d5QX77OowmDmEjK YNxZTJEifwh/+4HSpVTjqwQrIOPJcQb+k2lGd+ujoCa5jTD8kFpiBK6g1HVXRdbztH5b9u rEZutN15KDfWj3xlMtNxV6IMOlb9QZwrMorFrvQoqsTYtALu/ovRt9ZfOV5v2aJ8TXYZAI E+YZ1hYMGFALIBKo1+a7DjJnIqDwq8BiFwMC15beXZHt1tzqgpkAPaZu35nJxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640115801; a=rsa-sha256; cv=none; b=EmjGoNUVvg2lLb4vqAtCV02XnQl+1z90DnXH03dRf8+0DZFHWNhhz+mNkS6Pjg6haiUI/t 5UOU5hm3qwDCqq027j/XqKZ8VQZ3azfGUel4u14Kvk2et/e2ZsHMC7z8KciSAhBt6Smsox 1nd4AptoyFcEc6RVyxJqMqxnhjCYv7D0reNG24jlV8wfAt5v9XWmDv5565em+dUjx+kUOI 3wJuqnx47tmO1KED5cdrFBCqV+qzVrAJIZnaU/MC0ECzViBFsRAkWToQzvSWszXYNtt191 1lcjzxBYnMl47k1txK4L3bJlvaWdcCXGBs6hIk5FqLEhYa88OKpKfDiedin5RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=eaaf37ed752ec6c4b2866ceccb244be35951c258 commit eaaf37ed752ec6c4b2866ceccb244be35951c258 Author: Po-Chuan Hsieh AuthorDate: 2021-12-21 18:49:42 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-12-21 18:49:42 +0000 textproc/py-myst-parser: Allow build with py-markdown-it-py 2.0.0 and py-mdit-py-plugins 0.3.0 - Update version requirement of RUN_DEPENDS - Bump PORTREVISION for package change Obtained from: https://github.com/executablebooks/MyST-Parser/commit/43d5c66831cb2578bc034f9d6217d659ddc46847 --- textproc/py-myst-parser/Makefile | 5 +- textproc/py-myst-parser/files/patch-mdit-py | 85 +++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/textproc/py-myst-parser/Makefile b/textproc/py-myst-parser/Makefile index d3b9d75c1598..39d948e8c334 100644 --- a/textproc/py-myst-parser/Makefile +++ b/textproc/py-myst-parser/Makefile @@ -2,6 +2,7 @@ PORTNAME= myst-parser PORTVERSION= 0.15.2 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.15,1<0.18,1:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown-it-py>=1.0.0<2.0.0:textproc/py-markdown-it-py@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mdit-py-plugins>=0.2.8<0.3:textproc/py-mdit-py-plugins@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown-it-py>=1.0.0<3.0.0:textproc/py-markdown-it-py@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mdit-py-plugins>=0.3.0<0.4:textproc/py-mdit-py-plugins@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=3.1,1<5,1:textproc/py-sphinx@${PY_FLAVOR} diff --git a/textproc/py-myst-parser/files/patch-mdit-py b/textproc/py-myst-parser/files/patch-mdit-py new file mode 100644 index 000000000000..8e5e29b71585 --- /dev/null +++ b/textproc/py-myst-parser/files/patch-mdit-py @@ -0,0 +1,85 @@ +Obtained from: https://github.com/executablebooks/MyST-Parser/commit/43d5c66831cb2578bc034f9d6217d659ddc46847 + +--- myst_parser/docutils_.py.orig 2021-08-27 01:35:33 UTC ++++ myst_parser/docutils_.py +@@ -8,7 +8,6 @@ from typing import Tuple + from docutils import nodes + from docutils.parsers.rst import Parser as RstParser + from markdown_it.token import Token +-from markdown_it.utils import AttrDict + + from myst_parser.main import MdParserConfig, default_parser + +@@ -47,7 +46,7 @@ class Parser(RstParser): + config = MdParserConfig(renderer="docutils") + parser = default_parser(config) + parser.options["document"] = document +- env = AttrDict() ++ env: dict = {} + tokens = parser.parse(inputstring, env) + if not tokens or tokens[0].type != "front_matter": + # we always add front matter, so that we can merge it with global keys, +--- myst_parser/docutils_renderer.py.orig 2021-08-27 01:35:33 UTC ++++ myst_parser/docutils_renderer.py +@@ -782,11 +782,13 @@ class DocutilsRenderer(RendererProtocol): + + def render_math_inline(self, token: SyntaxTreeNode) -> None: + content = token.content +- if token.markup == "$$": +- # available when dmath_double_inline is True +- node = nodes.math_block(content, content, nowrap=False, number=None) +- else: +- node = nodes.math(content, content) ++ node = nodes.math(content, content) ++ self.add_line_and_source_path(node, token) ++ self.current_node.append(node) ++ ++ def render_math_inline_double(self, token: SyntaxTreeNode) -> None: ++ content = token.content ++ node = nodes.math_block(content, content, nowrap=False, number=None) + self.add_line_and_source_path(node, token) + self.current_node.append(node) + +--- myst_parser/sphinx_parser.py.orig 2021-08-27 01:35:33 UTC ++++ myst_parser/sphinx_parser.py +@@ -6,7 +6,6 @@ from docutils import nodes + from docutils.core import publish_doctree + from docutils.parsers.rst import Parser as RstParser + from markdown_it.token import Token +-from markdown_it.utils import AttrDict + from sphinx.application import Sphinx + from sphinx.io import SphinxStandaloneReader + from sphinx.parsers import Parser as SphinxParser +@@ -52,7 +51,7 @@ class MystParser(SphinxParser): + config = document.settings.env.myst_config + parser = default_parser(config) + parser.options["document"] = document +- env = AttrDict() ++ env: dict = {} + tokens = parser.parse(inputstring, env) + if not tokens or tokens[0].type != "front_matter": + # we always add front matter, so that we can merge it with global keys, +--- myst_parser/sphinx_renderer.py.orig 2021-08-27 01:35:33 UTC ++++ myst_parser/sphinx_renderer.py +@@ -122,7 +122,7 @@ class SphinxRenderer(DocutilsRenderer): + self.doc_env.myst_anchors = True # type: ignore[attr-defined] + section["myst-anchor"] = doc_slug + +- def render_math_block_eqno(self, token: SyntaxTreeNode) -> None: ++ def render_math_block_label(self, token: SyntaxTreeNode) -> None: + """Render math with referencable labels, e.g. ``$a=1$ (label)``.""" + label = token.info + content = token.content +--- setup.cfg.orig 2021-08-27 01:35:37 UTC ++++ setup.cfg +@@ -39,8 +39,8 @@ packages = find: + install_requires = + docutils>=0.15,<0.18 + jinja2 # required for substitutions, but let sphinx choose version +- markdown-it-py>=1.0.0,<2.0.0 +- mdit-py-plugins~=0.2.8 ++ markdown-it-py>=1.0.0,<3.0.0 ++ mdit-py-plugins~=0.3.0 + pyyaml + sphinx>=3.1,<5 + python_requires = >=3.6