On 2024/07/19 14:33, Bjorn Ketelaars wrote:
> devel/pre-commit doesn't have a py- prefix, but is flavoured. As
> pre-commit is a python3-only, standalone tool, proposal is to unflavour
> it. Triggered by a comment from sthen@ [0].
>
> Diff below:
> - Removes FLAVOR= / FLAVORS= from devel/pre-commit, bumps REVISION and
> sets a @pkgpath marker
> - Touches consumers: Changes depends devel/pre-commit${MODPY_FLAVOR} to
> devel/pre-commit and bumps REVISION
>
> OK?
OK with me, thanks. (Alternatively it could probably change to
py-pre-commit but this way is simpler).
> [0] https://marc.info/?l=openbsd-ports&m=172121815731770&w=2
>
>
> diff --git devel/pre-commit/Makefile devel/pre-commit/Makefile
> index 1e36b59ad35..5e2e72ccb26 100644
> --- devel/pre-commit/Makefile
> +++ devel/pre-commit/Makefile
> @@ -3,6 +3,7 @@ COMMENT = framework for managing git pre-commit
> hooks
> MODPY_EGG_VERSION = 3.7.1
> DISTNAME = pre_commit-${MODPY_EGG_VERSION}
> PKGNAME = pre-commit-${MODPY_EGG_VERSION}
> +REVISION = 0
>
> CATEGORIES = devel
>
> @@ -14,9 +15,6 @@ MAINTAINER = Pavel Korovin <p...@openbsd.org>
> PERMIT_PACKAGE = Yes
>
> MODULES = lang/python
> -FLAVOR = python3
> -FLAVORS = python3
> -
> MODPY_PI = Yes
> MODPY_PYBUILD = setuptools
>
> diff --git devel/pre-commit/pkg/PLIST devel/pre-commit/pkg/PLIST
> index 404c4ddc3ba..8f0c9c3c956 100644
> --- devel/pre-commit/pkg/PLIST
> +++ devel/pre-commit/pkg/PLIST
> @@ -1,3 +1,4 @@
> +@pkgpath devel/pre-commit,python3
> bin/pre-commit
> lib/python${MODPY_VERSION}/site-packages/pre_commit/
>
> lib/python${MODPY_VERSION}/site-packages/pre_commit-${MODPY_EGG_VERSION}.dist-info/
> diff --git devel/py-ipykernel/Makefile devel/py-ipykernel/Makefile
> index fa606a77c1b..82d0f25905d 100644
> --- devel/py-ipykernel/Makefile
> +++ devel/py-ipykernel/Makefile
> @@ -3,7 +3,7 @@ COMMENT = IPython kernel for Jupyter
> MODPY_EGG_VERSION = 6.29.4
> DISTNAME = ipykernel-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 0
> +REVISION = 1
>
> PORTROACH= limit:^6
>
> @@ -42,7 +42,7 @@ RUN_DEPENDS =
> devel/py-comm${MODPY_FLAVOR}>=0.1.1 \
> www/py-tornado${MODPY_FLAVOR}>=6.1
>
> # needs ipyparallel
> -TEST_DEPENDS = devel/pre-commit${MODPY_FLAVOR} \
> +TEST_DEPENDS = devel/pre-commit \
> devel/py-flaky${MODPY_FLAVOR} \
> devel/py-test-asyncio${MODPY_FLAVOR} \
> devel/py-test-cov${MODPY_FLAVOR} \
> diff --git devel/py-jupyter_client/Makefile devel/py-jupyter_client/Makefile
> index f385abbac31..87f50f16b84 100644
> --- devel/py-jupyter_client/Makefile
> +++ devel/py-jupyter_client/Makefile
> @@ -3,6 +3,7 @@ COMMENT = Jupyter protocol implementation and
> client libraries
> MODPY_EGG_VERSION = 8.6.2
> DISTNAME = jupyter_client-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> +REVISION = 0
>
> CATEGORIES = devel
>
> @@ -29,7 +30,7 @@ RUN_DEPENDS =
> devel/py-dateutil${MODPY_FLAVOR}>=2.8.2 \
> www/py-tornado${MODPY_FLAVOR}>=6.2
>
> TEST_DEPENDS = devel/ipython${MODPY_FLAVOR} \
> - devel/pre-commit${MODPY_FLAVOR} \
> + devel/pre-commit \
> devel/py-coverage${MODPY_FLAVOR} \
> devel/py-ipykernel${MODPY_FLAVOR}>=6.14 \
> devel/py-mypy${MODPY_FLAVOR} \
> diff --git devel/py-jupyter_core/Makefile devel/py-jupyter_core/Makefile
> index 0ddc7899d8d..dad1b3e3ecf 100644
> --- devel/py-jupyter_core/Makefile
> +++ devel/py-jupyter_core/Makefile
> @@ -3,7 +3,7 @@ COMMENT = Jupyter core package
> MODPY_EGG_VERSION = 5.7.2
> DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = devel
>
> @@ -25,7 +25,7 @@ MODPY_PYBUILD = hatchling
> RUN_DEPENDS = devel/py-traitlets${MODPY_FLAVOR} \
> sysutils/py-platformdirs${MODPY_FLAVOR}
>
> -TEST_DEPENDS = devel/pre-commit${MODPY_FLAVOR} \
> +TEST_DEPENDS = devel/pre-commit \
> devel/py-ipykernel${MODPY_FLAVOR} \
> devel/py-test-cov${MODPY_FLAVOR} \
> devel/py-test-timeout${MODPY_FLAVOR}
> diff --git devel/py-jupyter_server/Makefile devel/py-jupyter_server/Makefile
> index df6a3842694..ed6c35f29c9 100644
> --- devel/py-jupyter_server/Makefile
> +++ devel/py-jupyter_server/Makefile
> @@ -3,6 +3,7 @@ COMMENT = backend for Jupyter web applications
> MODPY_EGG_VERSION = 2.14.2
> DISTNAME = jupyter_server-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> +REVISION = 1
>
> CATEGORIES = devel
>
> @@ -42,7 +43,7 @@ RUN_DEPENDS =
> devel/py-jupyter_client${MODPY_FLAVOR}>=7.4.4 \
> www/py-terminado${MODPY_FLAVOR}>=0.8.3 \
> www/py-tornado${MODPY_FLAVOR}>=6.2.0
>
> -TEST_DEPENDS = devel/pre-commit${MODPY_FLAVOR} \
> +TEST_DEPENDS = devel/pre-commit \
> devel/py-coverage${MODPY_FLAVOR} \
> devel/py-flaky${MODPY_FLAVOR} \
> devel/py-ipykernel${MODPY_FLAVOR} \
> diff --git devel/py-nbformat/Makefile devel/py-nbformat/Makefile
> index 751384d6219..ca832fa7ec6 100644
> --- devel/py-nbformat/Makefile
> +++ devel/py-nbformat/Makefile
> @@ -3,7 +3,7 @@ COMMENT = Jupyter notebook format
> MODPY_EGG_VERSION = 5.9.2
> DISTNAME = nbformat-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = devel
>
> @@ -31,6 +31,6 @@ RUN_DEPENDS =
> devel/py-jsonschema${MODPY_FLAVOR}>=2.6 \
>
> # XXX: needs pep440
> TEST_DEPENDS = devel/py-testpath${MODPY_FLAVOR} \
> - devel/pre-commit${MODPY_FLAVOR}
> + devel/pre-commit
>
> .include <bsd.port.mk>
> diff --git devel/py-traitlets/Makefile devel/py-traitlets/Makefile
> index febb8dd46e1..cbb0cb5a2b5 100644
> --- devel/py-traitlets/Makefile
> +++ devel/py-traitlets/Makefile
> @@ -3,7 +3,7 @@ COMMENT = configuration system for Python
> applications
> MODPY_EGG_VERSION = 5.14.3
> DISTNAME = traitlets-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = devel
>
> @@ -23,7 +23,7 @@ MODPY_PI = Yes
> MODPY_PYBUILD = hatchling
> MODPY_PYTEST_ARGS = traitlets
>
> -TEST_DEPENDS = devel/pre-commit${MODPY_FLAVOR} \
> +TEST_DEPENDS = devel/pre-commit \
> devel/py-argcomplete${MODPY_FLAVOR} \
> devel/py-mypy${MODPY_FLAVOR} \
> devel/py-test-mock${MODPY_FLAVOR}
> diff --git www/woob/Makefile www/woob/Makefile
> index a06379f3252..7d3d9930243 100644
> --- www/woob/Makefile
> +++ www/woob/Makefile
> @@ -1,7 +1,7 @@
> COMMENT = web outside of browsers
>
> MODPY_EGG_VERSION = 3.6
> -REVISION = 1
> +REVISION = 2
> DISTNAME = woob-${MODPY_EGG_VERSION}
>
> CATEGORIES = www
> @@ -59,7 +59,7 @@ TEST_DEPENDS += devel/py-asttokens${MODPY_FLAVOR} \
> devel/py-test${MODPY_FLAVOR} \
> textproc/sphinx \
> devel/py-virtualenv${MODPY_FLAVOR} \
> - devel/pre-commit${MODPY_FLAVOR}
> + devel/pre-commit
> # missing
> # xunitparser
> # commitizen
>
