From nobody Thu Aug 31 05:47:51 2023 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 4RbqvC3wflz4rlWG; Thu, 31 Aug 2023 05:47:51 +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 4RbqvC1hkdz4JGB; Thu, 31 Aug 2023 05:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693460871; 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=H9RdxfQHh0cHJ1828M4+UuYz6zXIySTSix/1fD4KXyc=; b=wt8oou4AbC2G9yqriHPBQrVlvjsIIC33BYPvjH+lRHCasTyPrbuMo7+8nTOOCCn+W/Or8Z WP6DM2zsDIJ5stijTTpN2LTQQa5+mVOdYqGJSc7WYyrfFPVD6kyVvNyXlMOxVqDY6a54Lp xe16BZtLh5m7GO994BmjkQ1+XYP2Oj/2aSxrc3g6wkPKOovB0of57ShIt+9OGtqxfNge3a FEbn+f7EdfHsZHyGw6n/qH6aEBt3LSPAtsNh6hzBVj6F3N93lUcq86fqFmq9VC/F4ThNqi O9nTEYI57pazS1Ju7eYaE6nL2YEPbLZI7lojGUqkedEZrtNNAZAwqKZc9xFShw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693460871; a=rsa-sha256; cv=none; b=weiaoB6EmH3oCg/cgYqW+xThsaO7VpD+QYAvlE20foO+RD+h1iyMlcr3RQOOIstc2HTII5 prdGWq5z/GPrh8SIWi+dQJxm6BBkNp+6SKkYZUTcnB74rZtt5j3hQ8XLIKpQlKn35qBe/e ZNho0NXXlFsBNShsGr7fIRF4SQQig0dti9kfDRdWiPQ9f/OMmJB1rWT32DUo8872EzTasN 9/ZjDYc4MEBjb3RehVgbJAX/2flZbaaIBfnm6+ClJd4K5YHZGlE3WC73I1+XP/crmY9lFv E3zyiYuJI2dUt1/Kosp/8Inu/jSiU4fXwC8/Ax2pELLojBn/6wIcY5HL4Hcplw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693460871; 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=H9RdxfQHh0cHJ1828M4+UuYz6zXIySTSix/1fD4KXyc=; b=uIid8jGuBGlWg8k68XMvev8NRz0z4U8GjUI4Feij2p0l6mb6qelXZrXtHODQwS4Kg4HU+H OLV6gX+7LoqK2QSbxWjc4xQ0/Ow+QINniLqGoUEjW/GUxOuD7U9P1gNeEhIDd5zAkh7caP IDOiGX+za5y8Gw8Oi53NXpIUB0Y5pF78BHfIFgrWSFbKHWR8dZESuT6O/hnPR5EVBjKoiA LIhZmkSQ39EhC6y3EQom6KiiXQACn/xJmhkt6JZiKTnvvq7jD+7BXBjCD6OoB+RWgp6b11 N8gsACvcm/0WLuPt3+fmLK48Rm9Hk5M8pGhPVRdvYmOeEufXYHgL+pAl3xZBtw== 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 4RbqvC0nycz15GY; Thu, 31 Aug 2023 05:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37V5lp7U068389; Thu, 31 Aug 2023 05:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37V5lpgP068386; Thu, 31 Aug 2023 05:47:51 GMT (envelope-from git) Date: Thu, 31 Aug 2023 05:47:51 GMT Message-Id: <202308310547.37V5lpgP068386@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 6b168f112781 - main - textproc/py-mkdocstrings: Update to 0.22.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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b168f112781310a794a3ba68d99a38c819d9aba Auto-Submitted: auto-generated The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b168f112781310a794a3ba68d99a38c819d9aba commit 6b168f112781310a794a3ba68d99a38c819d9aba Author: Kai Knoblich AuthorDate: 2023-08-31 05:27:25 +0000 Commit: Kai Knoblich CommitDate: 2023-08-31 05:44:18 +0000 textproc/py-mkdocstrings: Update to 0.22.0 * Introduce CRYSTAL, PYTHON and PYTHONLEGACY options to reflect the optional dependencies as noted in "pyproject.toml". Leave the last two as non-default for now, because both are mutually exclusive due conflicting dependencies. * Switch to PEP517 build framework and get rid of the no longer required workarounds for distutils. * Remove the backported patch for Jinja2 3.1+ compatibility which is also no longer needed. * Convert the test suite to USE_PYTHON=pytest as well. Changelogs since 0.17.0: https://github.com/mkdocstrings/mkdocstrings/blob/0.22.0/CHANGELOG.md --- textproc/py-mkdocstrings/Makefile | 43 ++++++++++++++------- textproc/py-mkdocstrings/distinfo | 6 +-- textproc/py-mkdocstrings/files/patch-setup.py | 44 ---------------------- .../files/patch-src_mkdocstrings_loggers.py | 34 ----------------- 4 files changed, 33 insertions(+), 94 deletions(-) diff --git a/textproc/py-mkdocstrings/Makefile b/textproc/py-mkdocstrings/Makefile index 3b26f3a5d4a3..5d1896b78f99 100644 --- a/textproc/py-mkdocstrings/Makefile +++ b/textproc/py-mkdocstrings/Makefile @@ -1,6 +1,5 @@ PORTNAME= mkdocstrings -DISTVERSION= 0.17.0 -PORTREVISION= 1 +DISTVERSION= 0.22.0 CATEGORIES= textproc python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,32 +10,50 @@ WWW= https://github.com/mkdocstrings/mkdocstrings LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdm-backend>0:devel/py-pdm-backend@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=3.3:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markupsafe>=1.1:textproc/py-markupsafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocs>=1.2:textproc/py-mkdocs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymdown-extensions>=6.3:textproc/py-pymdown-extensions@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mkdocs-autorefs>=0.1:textproc/py-mkdocs-autorefs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytkdocs>=0.14.0:textproc/py-pytkdocs@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}mkdocs-autorefs>=0.3.1:textproc/py-mkdocs-autorefs@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocs-material>0:textproc/py-mkdocs-material@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} USES= python USE_GITHUB= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist pep517 pytest +# Skip "test_sphinx_load_mkdocstrings_inventory_file" as it requires +# mkdocs-gen-files (not in Ports tree, yet). +# The same applies to "test_plugin" which requires markdown-exec (not in Ports +# tree yet). +PYTEST_IGNORED_TESTS= test_sphinx_load_mkdocstrings_inventory_file test_plugin +# Required otherwise the build process tries to get the current version via git +MAKE_ENV= PDM_BUILD_SCM_VERSION=${DISTVERSION} TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} NO_ARCH= yes -post-patch: - @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|' ${WRKSRC}/setup.py +OPTIONS_DEFINE= CRYSTAL +OPTIONS_DEFAULT= CRYSTAL +OPTIONS_RADIO= PYHANDLER +OPTIONS_RADIO_PYHANDLER= PYTHON PYTHONLEGACY -# Skip "test_sphinx_load_mkdocstrings_inventory_file" as it requires -# mkdocs-gen-files (not in Ports tree, yet). -do-test: - @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs \ - -k 'not test_sphinx_load_mkdocstrings_inventory_file' +CRYSTAL_DESC= Crystal language handler +PYTHONLEGACY_DESC= Legacy Python language handler +PYTHON_DESC= Python language handler + +CRYSTAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mkdocstrings-crystal>=0.3.4:textproc/py-mkdocstrings-crystal@${PY_FLAVOR} +PYTHONLEGACY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mkdocstrings-python-legacy>=0.2.1:textproc/py-mkdocstrings-python-legacy@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mkdocstrings-python>=0.5.2:textproc/py-mkdocstrings-python@${PY_FLAVOR} + +.include + +.if ${PYTHON_REL} < 31000 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.6:devel/py-importlib-metadata@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.1:devel/py-typing-extensions@${PY_FLAVOR} +.endif -.include +.include diff --git a/textproc/py-mkdocstrings/distinfo b/textproc/py-mkdocstrings/distinfo index 7ffaec2dfc77..b6fe9927b69d 100644 --- a/textproc/py-mkdocstrings/distinfo +++ b/textproc/py-mkdocstrings/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645976995 -SHA256 (mkdocstrings-mkdocstrings-0.17.0_GH0.tar.gz) = dcd8f03387c423bb1ddf6fbbec8dfa0432dfc3d01001adb4a0c07985f333971c -SIZE (mkdocstrings-mkdocstrings-0.17.0_GH0.tar.gz) = 73551 +TIMESTAMP = 1688217280 +SHA256 (mkdocstrings-mkdocstrings-0.22.0_GH0.tar.gz) = fcabb0e22b5630de43ade2e26c3ace2d2d70f132a472da3fda0421571e24883d +SIZE (mkdocstrings-mkdocstrings-0.22.0_GH0.tar.gz) = 81345 diff --git a/textproc/py-mkdocstrings/files/patch-setup.py b/textproc/py-mkdocstrings/files/patch-setup.py deleted file mode 100644 index 99fdbaca862e..000000000000 --- a/textproc/py-mkdocstrings/files/patch-setup.py +++ /dev/null @@ -1,44 +0,0 @@ ---- setup.py.orig 2022-02-28 05:29:01 UTC -+++ setup.py -@@ -0,0 +1,41 @@ -+# Generated via pdm export -f setuppy" (run "pdm lock" beforehand) -+# -*- coding: utf-8 -*- -+from setuptools import setup -+ -+INSTALL_REQUIRES = [ -+ 'Jinja2>=2.11.1', -+ 'Markdown>=3.3', -+ 'MarkupSafe>=1.1', -+ 'mkdocs>=1.2', -+ 'mkdocs-autorefs>=0.1', -+ 'pymdown-extensions>=6.3', -+ 'pytkdocs>=0.14.0', -+] -+ENTRY_POINTS = { -+ 'mkdocs.plugins': [ -+ 'mkdocstrings = mkdocstrings.plugin:MkdocstringsPlugin', -+ ], -+} -+ -+setup_kwargs = { -+ 'name': 'mkdocstrings', -+ 'version': '%%DISTVERSION%%', -+ 'description': 'Automatic documentation from sources, for MkDocs.', -+ 'author': '', -+ 'author_email': 'Timothée Mazzucotelli ', -+ 'package_dir': {'': 'src/'}, -+ 'packages': [ -+ 'mkdocstrings', -+ 'mkdocstrings.handlers', -+ 'mkdocstrings.templates.python', -+ 'mkdocstrings.templates.python.material', -+ 'mkdocstrings.templates.python.mkdocs', -+ 'mkdocstrings.templates.python.readthedocs' -+ ], -+ 'package_data': {'': ['*']}, -+ 'install_requires': INSTALL_REQUIRES, -+ 'python_requires': '>=3.6.2', -+ 'entry_points': ENTRY_POINTS, -+} -+ -+setup(**setup_kwargs) diff --git a/textproc/py-mkdocstrings/files/patch-src_mkdocstrings_loggers.py b/textproc/py-mkdocstrings/files/patch-src_mkdocstrings_loggers.py deleted file mode 100644 index defa90fffce3..000000000000 --- a/textproc/py-mkdocstrings/files/patch-src_mkdocstrings_loggers.py +++ /dev/null @@ -1,34 +0,0 @@ -From: =?UTF-8?q?Timoth=C3=A9e=20Mazzucotelli?= -Date: Wed, 2 Feb 2022 12:27:27 +0100 -Subject: [PATCH] refactor: Support Jinja2 3.1 - -Issue #360: https://github.com/mkdocstrings/mkdocstrings/issues/360 -PR #361: https://github.com/mkdocstrings/mkdocstrings/issues/361 - ---- src/mkdocstrings/loggers.py.orig 2021-12-27 17:59:33 UTC -+++ src/mkdocstrings/loggers.py -@@ -4,10 +4,14 @@ from typing import Any, Callable, Optional, Tuple - from pathlib import Path - from typing import Any, Callable, Optional, Tuple - --from jinja2 import contextfunction - from jinja2.runtime import Context - from mkdocs.utils import warning_filter - -+try: -+ from jinja2 import pass_context -+except ImportError: # TODO: remove once Jinja2 < 3.1 is dropped -+ from jinja2 import contextfunction as pass_context # noqa: WPS440 -+ - TEMPLATES_DIR = Path(__file__).parent / "templates" - - -@@ -71,7 +75,7 @@ def get_template_logger_function(logger_func: Callable - A function. - """ - -- @contextfunction -+ @pass_context - def wrapper(context: Context, msg: Optional[str] = None) -> str: - """Log a message. -