diff --git a/textproc/py-mdformat/Makefile b/textproc/py-mdformat/Makefile index b7c930b72f33..915e56643002 100644 --- a/textproc/py-mdformat/Makefile +++ b/textproc/py-mdformat/Makefile @@ -1,54 +1,56 @@ -# XXX: see below (post-patch target) before updating PORTNAME= mdformat -DISTVERSION= 0.7.22 -PORTREVISION= 3 +# XXX: see below (post-patch target) before updating +DISTVERSION= 1.0.0 +PORTREVISION= 0 CATEGORIES= textproc python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= nivit@FreeBSD.org COMMENT= CommonMark compliant Markdown formatter WWW= https://github.com/hukkin/mdformat LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.41.3:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=3.6.0:devel/py-importlib-metadata@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_TOMLI} \ + ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=3.6.0:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown-it-py>=1<5:textproc/py-markdown-it-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mdurl>=0.1.2:textproc/py-mdurl@${PY_FLAVOR} \ - ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}zipp>=0.5:devel/py-zipp@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}covdefaults>=2.3.0_1:devel/py-covdefaults@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=4.1.0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-randomly>=3.12.0:devel/py-pytest-randomly@${PY_FLAVOR} USES= python USE_GITHUB= yes GH_ACCOUNT= executablebooks USE_PYTHON= autoplist pep517 pytest +# tests: 4282 passed, 5 skipped (require Python 3.13+), 2 warnings +TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + NO_ARCH= yes OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.18.1:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}furo>=2022.6.21:textproc/py-furo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}myst-parser>=0.18.0:textproc/py-myst-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=5.4.0:textproc/py-sphinx@${PY_FLAVOR} DOCS_PORTDOCS= * .buildinfo -# tests: 4282 passed, 5 skipped (require Python 3.13+) -TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} - # XXX: remove this target as soon as devel/py-setuptools is updated to version >= 69 post-patch: @${REINPLACE_CMD} \ - -e 's/\(setuptools>=\)69/\163/1' \ - ${WRKSRC}/pyproject.toml + -e 's/\(setuptools>=\)77\.0\.3/\163/1' \ + -e 's/\(license = \)"MIT"/\1{file = "LICENSE"}/1' \ + -e '/^license-files =/d' \ + ${WRKSRC}/pyproject.toml post-install-DOCS-on: ${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ -d ${WRKDIR} -b html -n ${WRKSRC}/docs ${STAGEDIR}${DOCSDIR} .include diff --git a/textproc/py-mdformat/distinfo b/textproc/py-mdformat/distinfo index 4a8d4ffed71c..9d8fa1f16745 100644 --- a/textproc/py-mdformat/distinfo +++ b/textproc/py-mdformat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739874344 -SHA256 (executablebooks-mdformat-0.7.22_GH0.tar.gz) = b793e355e00a61f8c0e7e3a642f7430b858c073cf86c7371d20fe6ce79f3e4d3 -SIZE (executablebooks-mdformat-0.7.22_GH0.tar.gz) = 94092 +TIMESTAMP = 1767882391 +SHA256 (executablebooks-mdformat-1.0.0_GH0.tar.gz) = ddca5bb3cf83a6541a60c4931556b8179d9b5dd5e2aa02973c0cc091b2550f68 +SIZE (executablebooks-mdformat-1.0.0_GH0.tar.gz) = 118368 diff --git a/textproc/py-mdformat/files/patch-pyproject.toml b/textproc/py-mdformat/files/patch-pyproject.toml deleted file mode 100644 index b34885e1d500..000000000000 --- a/textproc/py-mdformat/files/patch-pyproject.toml +++ /dev/null @@ -1,13 +0,0 @@ -Obtained from: https://github.com/hukkin/mdformat/commit/a822aca00e5b918953597499e67c8bb7767c7960 - ---- pyproject.toml.orig 2025-01-30 17:57:20 UTC -+++ pyproject.toml -@@ -13,7 +13,7 @@ dependencies = [ - license = { file = "LICENSE" } - requires-python = ">=3.9" - dependencies = [ -- 'markdown-it-py >=1.0.0,<4.0.0', -+ 'markdown-it-py>=1,<5', - 'tomli >=1.1.0; python_version < "3.11"', - 'importlib-metadata >=3.6.0; python_version < "3.10"', - ] diff --git a/textproc/py-mdformat/files/patch-src_mdformat___conf.py b/textproc/py-mdformat/files/patch-src_mdformat___conf.py index 772ec1c6678b..7e28393a0541 100644 --- a/textproc/py-mdformat/files/patch-src_mdformat___conf.py +++ b/textproc/py-mdformat/files/patch-src_mdformat___conf.py @@ -1,22 +1,23 @@ ---- src/mdformat/_conf.py.orig 2025-01-30 17:57:20 UTC +--- src/mdformat/_conf.py.orig 2025-10-16 12:00:48 UTC +++ src/mdformat/_conf.py -@@ -1,6 +1,6 @@ from __future__ import annotations +@@ -1,7 +1,7 @@ from collections.abc import Mapping from __future__ import annotations + from collections.abc import Mapping -import functools +import functools, os from pathlib import Path from types import MappingProxyType - from typing import Mapping + @@ -35,7 +35,10 @@ def read_toml_opts(conf_dir: Path) -> tuple[Mapping, P - @functools.lru_cache() + @functools.lru_cache def read_toml_opts(conf_dir: Path) -> tuple[Mapping, Path | None]: conf_path = conf_dir / ".mdformat.toml" - if not conf_path.is_file(): + # conf_path.is_file() throws an exception when trying to access /net, + # a directory used only by autoconf with special attributes. + # https://github.com/hukkin/mdformat/issues/565#issuecomment-3697204512 + if not os.path.isfile(str(conf_path)): parent_dir = conf_dir.parent if conf_dir == parent_dir: return {}, None