Attachment 257571 Details for Bug 284845 – textproc/py-sphinx: Update to 8.1.3

[patch] textproc/py-sphinx: Update to 8.1.3

0001-textproc-py-sphinx-Update-to-8.1.3.patch (text/plain), 6.56 KB, created by Alastair Hogge on 2025-02-16 08:26:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alastair Hogge

Created: 2025-02-16 08:26:52 UTC

Size: 6.56 KB

patch

obsolete

>From 731d69ddeef6f3f7712bb08c42e44536f73170ca Mon Sep 17 00:00:00 2001
>From: Alastair Hogge <agh@riseup.net>
>Date: Sun, 16 Feb 2025 16:24:58 +0800
>Subject: [PATCH] textproc/py-sphinx: Update to 8.1.3
>
>Update to 8.1.3:
>* Drop ${DISTNAME}
>* Drop files/patch-pyproject.toml
>* Some port{clippy,fmt,lint} maintenance
>* Use ${DISTVERSION} over ${PORTVERSION}
>* Use ${TAR} over hard coded binary name
>
> PR:            284845
>---
> textproc/py-sphinx/Makefile                   | 58 ++++++++++---------
> textproc/py-sphinx/distinfo                   |  6 +-
> textproc/py-sphinx/files/patch-pyproject.toml | 11 ----
> 3 files changed, 35 insertions(+), 40 deletions(-)
> delete mode 100644 textproc/py-sphinx/files/patch-pyproject.toml
>
>diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
>index f1530738a7a8..05dc4c3ef427 100644
>--- a/textproc/py-sphinx/Makefile
>+++ b/textproc/py-sphinx/Makefile
>@@ -1,11 +1,9 @@
> PORTNAME=	sphinx
>-PORTVERSION=	5.3.0
>-PORTREVISION=	3
>+DISTVERSION=	8.1.3
> PORTEPOCH=	1
> CATEGORIES=	textproc python
> MASTER_SITES=	PYPI
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>-DISTNAME=	Sphinx-${PORTVERSION}
> DIST_SUBDIR=	python
> 
> # NOTE: before committing to this port, contact portmgr to arrange for an
>@@ -16,31 +14,37 @@ COMMENT=	Python documentation generator
> WWW=		https://www.sphinx-doc.org/
> 
> LICENSE=	BSD2CLAUSE
>-LICENSE_FILE=	${WRKSRC}/LICENSE
>-
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.7:devel/py-flit-core@${PY_FLAVOR}
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>=0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>=0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>=2.0.0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>=1.1.5:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0:devel/py-Jinja2@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pygments>=2.12:textproc/py-pygments@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}docutils>=0.14,1<0.22,1:textproc/py-docutils@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=2.0:textproc/py-snowballstemmer@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}Babel>=2.9:devel/py-babel@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7<0.8:textproc/py-alabaster@${PY_FLAVOR} \
>+LICENSE_FILE=	${WRKSRC}/LICENSE.rst
>+
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}alabaster>=0.7.14:textproc/py-alabaster@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}Babel>=2.13:devel/py-babel@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}docutils>=0.20:textproc/py-docutils@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}imagesize>=1.3:graphics/py-imagesize@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}packaging>=21.0:devel/py-packaging@${PY_FLAVOR} \
>-		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1:devel/py-Jinja2@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}packaging>23.0:devel/py-packaging@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pygments>=2.17:textproc/py-pygments@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}requests>=2.30.0:www/py-requests@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=2.2:textproc/py-snowballstemmer@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>=1.0.7:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>1.0.6:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>=2.0.6:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>=1.0.1:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>=1.0.6:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>=1.1.9:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=3.0:lang/cython3@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}defusedxml>=0.7.1:devel/py-defusedxml@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=3.4:devel/py-pytest-xdist@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pytest>=8.0:devel/py-pytest@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}setuptools>=70.0:devel/py-setuptools@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}tox>=4.2.0:devel/py-tox@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}typing_extensions>=4.9:devel/py-typing-extensions@${PY_FLAVOR}
> 
>-USES=		python
>-USE_PYTHON=	autoplist concurrent cython_test pep517 pytest
>+USES=			python
>+USE_PYTHON=		autoplist concurrent cython_test pep517 pytest
>+PEP517_BUILD_DEPEND=	${PYTHON_PKGNAMEPREFIX}flit-core>=3.2.0<4:devel/py-flit-core@${PY_FLAVOR}
>+PEP517_BUILD_CMD=	${PYTHON_CMD} -m flit_core.wheel
> 
>-NO_ARCH=	yes
> PYTEST_BROKEN_TESTS=	test_anchors_ignored \
> 			test_defaults \
> 			test_defaults_json \
>@@ -49,7 +53,9 @@ PYTEST_BROKEN_TESTS=	test_anchors_ignored \
> 
> # Upstream archive contains files with UTF-8 names (#246618)
> # https://github.com/sphinx-doc/sphinx/issues/2395
>-EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
>+EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
>+
>+NO_ARCH=	yes
> 
> .include <bsd.port.pre.mk>
> 
>diff --git a/textproc/py-sphinx/distinfo b/textproc/py-sphinx/distinfo
>index 113008ba7955..e3c232bfc676 100644
>--- a/textproc/py-sphinx/distinfo
>+++ b/textproc/py-sphinx/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1667762756
>-SHA256 (python/Sphinx-5.3.0.tar.gz) = 51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5
>-SIZE (python/Sphinx-5.3.0.tar.gz) = 6811365
>+TIMESTAMP = 1739674814
>+SHA256 (python/sphinx-8.1.3.tar.gz) = 43c1911eecb0d3e161ad78611bc905d1ad0e523e4ddc202a58a821773dc4c927
>+SIZE (python/sphinx-8.1.3.tar.gz) = 8184611
>diff --git a/textproc/py-sphinx/files/patch-pyproject.toml b/textproc/py-sphinx/files/patch-pyproject.toml
>deleted file mode 100644
>index ede4dd8e0985..000000000000
>--- a/textproc/py-sphinx/files/patch-pyproject.toml
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- pyproject.toml.orig	2022-10-16 09:53:52 UTC
>-+++ pyproject.toml
>-@@ -65,7 +65,7 @@ dependencies = [
>-     "sphinxcontrib-qthelp",
>-     "Jinja2>=3.0",
>-     "Pygments>=2.12",
>--    "docutils>=0.14,<0.20",
>-+    "docutils>=0.14,<0.22",
>-     "snowballstemmer>=2.0",
>-     "babel>=2.9",
>-     "alabaster>=0.7,<0.8",
>-- 
>2.48.1
>

Actions: View | Diff

Attachments on bug 284845: 257571 | 257653 | 257668 | 257759