From nobody Sun Jul 21 16:57:38 2024 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 4WRqN31QRnz5RprS; Sun, 21 Jul 2024 16:57:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRqN26WFkz4rs4; Sun, 21 Jul 2024 16:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721581058; 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=HWKPdFGidCRFpCsUFg/s70xqcJ5PhAuUNvhMhFAVY4E=; b=Fnzg+MTAf53iVNX3jajUk7PHhaCOLM5eghvoIwWVqmTAf9b2TKPVJ7Fcfe5IuWLcmNphFn hjlFtpG+QbeL33zaApmsjdwzlHntx/3zM05Tbj/X6knMe8QSLzYbC7w5E3EDncIyJR5YSo dIm/TSrzVEANpMBzcD+tnIwJT8YVojRIzzSguV4GL9AaVNQXzrqIKxvNlNWWxOu7Jrybfc jrb+vrbZWRPN2FTSOHmnqhfpaEfMiXfHlIS4MOOYMrcbNp4dnf4ebmywVPEXWKJ36Vzfjk kIunla0y4LbzXBsZzLE2HedyHLbwyN/VfnqFFDYAv1bXvf0eUOnA7xbTJoVrgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721581058; a=rsa-sha256; cv=none; b=n9/j8PIC19IKPIfdAy5A3/vzmYal+7TcsPWrjHk4iPVOaN2BrCSYzZFoONsHALkU0LpqtY 0y006F1/D5NKl1ec4mAab0CfnRs7Vq+i6Slsm2Iu6NQ1XVdxi12doIEYdQHAAFvvfJ58yl 9mjDTTrCZBQpn21vGDfPlP8dd/gpGOSoa6D6LzodQPJKL886SGOiVdoXPlCh0Ul0lt5hpM 1GCL0Q5DyDFGBpC8nAgwJ1Q0kqidxAAledxjTLkGkbmaobytD0qplmkwFfuUATFzvgyhCQ b2vQ5o6NL9V/E2cuWjyt1YE1BdW1GA6+pN+n/GcCV/a+o3HiCA7oMRhWumDkGg== 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=1721581058; 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=HWKPdFGidCRFpCsUFg/s70xqcJ5PhAuUNvhMhFAVY4E=; b=Rg0HoQ1N3U8b/3+HX2BDSeIIBaqtszgu92a1GdQVf0pja0hogjVguVlHx8BwPlslJvLo3i bFDLPDjojdk/8ojWhZ+lnjuXj+oIr7p3LQDZDQqIma6so4fqo0p4Nahq68nZz+uRSS+2jK AUnp0hmhhqYW7bQPTbdw3xl3nOULPl6eHkOgP4dXRtUfzbpyMQxcWpheYPGI36Or3CAcl0 yege7KEFPtCthgcfo+gwP/Q4JrifQfIFPc61urDFEm6S4AxwNQ/aoi2R0OBjzHEvL/bMYy Xeio8U+K+inyo6F25JYYQ/Y2dFYwiUCfT5dJA+lAUn5taCnt16kmT8fYOZW15g== 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 4WRqN266H9z17r8; Sun, 21 Jul 2024 16:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46LGvclm096420; Sun, 21 Jul 2024 16:57:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LGvcKV096417; Sun, 21 Jul 2024 16:57:38 GMT (envelope-from git) Date: Sun, 21 Jul 2024 16:57:38 GMT Message-Id: <202407211657.46LGvcKV096417@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: 180cd7365c99 - main - Mk/Uses/python.mk: Introduce PY_TOMLI 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 180cd7365c99492bcd78a06b5070190e6f950245 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=180cd7365c99492bcd78a06b5070190e6f950245 commit 180cd7365c99492bcd78a06b5070190e6f950245 Author: Po-Chuan Hsieh AuthorDate: 2024-07-21 16:53:28 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-07-21 16:55:40 +0000 Mk/Uses/python.mk: Introduce PY_TOMLI - Convert ports to use PY_TOMLI to simplify Makefile. The minimal version is set to 2.0.1 because it is required by multiple ports such as devel/py-poetry. The upper bound of version is set to 3 because it is limited by devel/py-poetry. With hat: python --- Mk/Uses/python.mk | 1 + databases/py-psycopg-c/Makefile | 9 ++------- devel/meson-python/Makefile | 8 ++++---- devel/nox/Makefile | 5 ++--- devel/py-black/Makefile | 7 ++----- devel/py-build/Makefile | 7 ++----- devel/py-check-jsonschema/Makefile | 7 ++----- devel/py-check-manifest/Makefile | 11 +++-------- devel/py-check-sdist/Makefile | 7 ++----- devel/py-deptry/Makefile | 9 ++------- devel/py-docformatter/Makefile | 8 ++------ devel/py-flake8-black/Makefile | 11 +++-------- devel/py-flit-scm/Makefile | 15 +++++---------- devel/py-frozenlist/Makefile | 9 ++------- devel/py-glom/Makefile | 8 ++------ devel/py-hatch-fancy-pypi-readme/Makefile | 11 +++-------- devel/py-hatchling/Makefile | 9 ++------- devel/py-jupyterlab/Makefile | 5 +---- devel/py-maturin/Makefile | 11 +++-------- devel/py-msgspec/Makefile | 11 +++-------- devel/py-mypy/Makefile | 11 +++-------- devel/py-pdm-build-locked/Makefile | 9 ++------- devel/py-pdm/Makefile | 5 +---- devel/py-pep517/Makefile | 9 ++------- devel/py-pip-run/Makefile | 7 ++----- devel/py-pip-tools/Makefile | 9 ++------- devel/py-pipx/Makefile | 9 ++------- devel/py-poetry/Makefile | 5 +---- devel/py-pre-commit-hooks/Makefile | 11 +++-------- devel/py-pyproject-flake8/Makefile | 11 +++-------- devel/py-pyproject-fmt/Makefile | 11 +++-------- devel/py-pytest/Makefile | 11 +++-------- devel/py-responses/Makefile | 9 ++------- devel/py-scikit-build-core/Makefile | 7 ++----- devel/py-setuptools-rust/Makefile | 13 ++++--------- devel/py-setuptools-scm/Makefile | 11 +++-------- devel/py-setuptools_scm7/Makefile | 12 +++--------- devel/py-sip/Makefile | 11 +++-------- devel/py-tox/Makefile | 9 ++------- devel/py-validate-pyproject/Makefile | 9 ++------- devel/py-versioneer/Makefile | 12 +++--------- devel/pylint/Makefile | 5 +---- multimedia/gstreamer1-plugins-rust/Makefile | 11 +++-------- textproc/py-autopep8/Makefile | 11 +++-------- textproc/py-dparse/Makefile | 11 +++-------- textproc/py-numpydoc/Makefile | 11 +++-------- textproc/py-sphinx-theme-builder/Makefile | 11 +++-------- textproc/py-towncrier/Makefile | 11 +++-------- www/py-hypercorn/Makefile | 2 +- 49 files changed, 119 insertions(+), 324 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 486b1dd8c3cb..fa529e308727 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -835,6 +835,7 @@ PY_SETUPTOOLS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAV # Common Python modules that can be needed but only for some versions of Python. . if ${PYTHON_REL} < 31100 PY_EXCEPTIONGROUP= ${PYTHON_PKGNAMEPREFIX}exceptiongroup>=1.1.1:devel/py-exceptiongroup@${PY_FLAVOR} +PY_TOMLI= ${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1<3:textproc/py-tomli@${PY_FLAVOR} . endif . if ${PYTHON_REL} >= 30000 diff --git a/databases/py-psycopg-c/Makefile b/databases/py-psycopg-c/Makefile index 584c6b96108a..7639535355ac 100644 --- a/databases/py-psycopg-c/Makefile +++ b/databases/py-psycopg-c/Makefile @@ -14,6 +14,7 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=49.2.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.37:devel/py-wheel@${PY_FLAVOR} USES= pgsql python @@ -22,10 +23,4 @@ USE_PYTHON= autoplist concurrent cython pep517 post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + -.include - -.if ${PYTHON_REL} < 31100 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/meson-python/Makefile b/devel/meson-python/Makefile index ccd8e7f1abe3..c05b403172b6 100644 --- a/devel/meson-python/Makefile +++ b/devel/meson-python/Makefile @@ -15,10 +15,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= meson:devel/meson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0.19.0:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>=0.7.1:devel/py-pyproject-metadata@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>=0.7.1:devel/py-pyproject-metadata@${PY_FLAVOR} \ + ${PY_TOMLI} RUN_DEPENDS= meson:devel/meson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0.19.0:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>=0.7.1:devel/py-pyproject-metadata@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>=0.7.1:devel/py-pyproject-metadata@${PY_FLAVOR} \ + ${PY_TOMLI} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ @@ -33,8 +35,6 @@ NO_ARCH= yes .include .if ${PYTHON_REL} < 31100 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR} .endif diff --git a/devel/nox/Makefile b/devel/nox/Makefile index d4073a9aef10..8f315a5264fd 100644 --- a/devel/nox/Makefile +++ b/devel/nox/Makefile @@ -17,9 +17,8 @@ PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=1.9.4<4.0:devel/py-argcomplete@$ BUILD_DEPENDS= ${PY_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PY_DEPENDS} -py39_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tomli>=1:textproc/py-tomli@${PY_FLAVOR} -py310_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tomli>=1:textproc/py-tomli@${PY_FLAVOR} +RUN_DEPENDS= ${PY_DEPENDS} \ + ${PY_TOMLI} USES= python USE_PYTHON= pep517 autoplist pytest # 37 tests fail, see https://github.com/wntrblm/nox/issues/820 diff --git a/devel/py-black/Makefile b/devel/py-black/Makefile index e8b074ef0e92..04ff26abaeb0 100644 --- a/devel/py-black/Makefile +++ b/devel/py-black/Makefile @@ -20,7 +20,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=8.0.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=22.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pathspec>=0.9.0:devel/py-pathspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=2:devel/py-platformdirs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}regex>=2020.1.8:textproc/py-regex@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}regex>=2020.1.8:textproc/py-regex@${PY_FLAVOR} \ + ${PY_TOMLI} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=5.3:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>=7.8.0:devel/ipython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pre-commit>=0:devel/py-pre-commit@${PY_FLAVOR} \ @@ -53,8 +54,4 @@ UVLOOP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}uvloop>=0.15.2:devel/py-uvloop@${PY_F RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.0.1:devel/py-typing-extensions@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -.endif - .include diff --git a/devel/py-build/Makefile b/devel/py-build/Makefile index 152b2a7fcd89..3683ce2e25a7 100644 --- a/devel/py-build/Makefile +++ b/devel/py-build/Makefile @@ -13,7 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=19.1:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyproject_hooks>=0:devel/py-pyproject_hooks@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pyproject_hooks>=0:devel/py-pyproject_hooks@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= allflavors autoplist concurrent pep517 @@ -29,8 +30,4 @@ PEP517_BUILD_DEPEND= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.8:devel/py-flit-core@${ #RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.6:devel/py-importlib-metadata@${PY_FLAVOR} #.endif -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -.endif - .include diff --git a/devel/py-check-jsonschema/Makefile b/devel/py-check-jsonschema/Makefile index cdcea74ecfac..50b9bc7dc793 100644 --- a/devel/py-check-jsonschema/Makefile +++ b/devel/py-check-jsonschema/Makefile @@ -17,7 +17,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=8<9:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18.0<5.0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regress>=0.4.0:devel/py-regress@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0<3.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.18.6:devel/py-ruamel.yaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.18.6:devel/py-ruamel.yaml@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 @@ -30,8 +31,4 @@ NO_ARCH= yes RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.4.0:devel/py-importlib-resources@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 1100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=2.0:textproc/py-tomli@${PY_FLAVOR} -.endif - .include diff --git a/devel/py-check-manifest/Makefile b/devel/py-check-manifest/Makefile index 07add6e30bd2..9d25b1d8cd38 100644 --- a/devel/py-check-manifest/Makefile +++ b/devel/py-check-manifest/Makefile @@ -14,7 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=0.1:devel/py-build@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=0.1:devel/py-build@${PY_FLAVOR} \ + ${PY_TOMLI} TEST_DEPENDS= git-tiny>=0:devel/git@tiny \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} @@ -23,10 +24,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-check-sdist/Makefile b/devel/py-check-sdist/Makefile index 4461a5e19741..369b6666732e 100644 --- a/devel/py-check-sdist/Makefile +++ b/devel/py-check-sdist/Makefile @@ -14,7 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=0:devel/py-build@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pathspec>=0:devel/py-pathspec@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pathspec>=0:devel/py-pathspec@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 @@ -27,8 +28,4 @@ NO_ARCH= yes RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - .include diff --git a/devel/py-deptry/Makefile b/devel/py-deptry/Makefile index 16e9f618e77f..decf0ce2f0a3 100644 --- a/devel/py-deptry/Makefile +++ b/devel/py-deptry/Makefile @@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=1.5<2.0:devel/py-maturin@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=8.0.0<9:devel/py-click@${PY_FLAVOR} \ + ${PY_TOMLI} USES= cargo python USE_PYTHON= autoplist concurrent pep517 @@ -23,10 +24,4 @@ CARGO_BUILD= no CARGO_INSTALL= no WRKSRC= ${WRKDIR}/deptry-${PORTVERSION} -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-docformatter/Makefile b/devel/py-docformatter/Makefile index 4f11b9e5460b..ad9d74a11274 100644 --- a/devel/py-docformatter/Makefile +++ b/devel/py-docformatter/Makefile @@ -27,10 +27,6 @@ OPTIONS_DEFINE= TOMLI OPTIONS_DEFAULT=TOMLI TOMLI_DESC= TOML (Tom's Obvious Minimal Language) support -.include +TOMLI_RUN_DEPENDS= ${PY_TOMLI} -.if ${PORT_OPTIONS:MTOMLI} && ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=2.0.0<3:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-flake8-black/Makefile b/devel/py-flake8-black/Makefile index 391d7295e04c..409eb3793709 100644 --- a/devel/py-flake8-black/Makefile +++ b/devel/py-flake8-black/Makefile @@ -15,17 +15,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}black>=22.1.0:devel/py-black@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}flake8>=3:devel/py-flake8@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}flake8>=3:devel/py-flake8@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-flit-scm/Makefile b/devel/py-flit-scm/Makefile index 700a8a1db5ff..a009fe7428c4 100644 --- a/devel/py-flit-scm/Makefile +++ b/devel/py-flit-scm/Makefile @@ -15,21 +15,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.5<4:devel/py-flit-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4:devel/py-setuptools-scm@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4:devel/py-setuptools-scm@${PY_FLAVOR} \ + ${PY_TOMLI} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.5<4:devel/py-flit-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4:devel/py-setuptools-scm@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4:devel/py-setuptools-scm@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-frozenlist/Makefile b/devel/py-frozenlist/Makefile index 723e76b9150c..a2c40128c251 100644 --- a/devel/py-frozenlist/Makefile +++ b/devel/py-frozenlist/Makefile @@ -13,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}expandvars>=0:devel/py-expandvars@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=47:devel/py-setuptools@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} USES= gettext-runtime python @@ -21,10 +22,4 @@ USE_PYTHON= autoplist concurrent cython pep517 post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + -.include - -.if ${PYTHON_REL} < 31100 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-glom/Makefile b/devel/py-glom/Makefile index adda3c68b72c..a14e3330dfec 100644 --- a/devel/py-glom/Makefile +++ b/devel/py-glom/Makefile @@ -28,10 +28,6 @@ OPTIONS_DEFINE= TOML OPTIONS_DEFAULT=TOML TOML_DESC= TOML (Tom's Obvious Minimal Language) support -.include +TOMLI_RUN_DEPENDS= ${PY_TOMLI} -.if ${PORT_OPTIONS:MTOML} && ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-hatch-fancy-pypi-readme/Makefile b/devel/py-hatch-fancy-pypi-readme/Makefile index e7820011b5a1..86070f8f978b 100644 --- a/devel/py-hatch-fancy-pypi-readme/Makefile +++ b/devel/py-hatch-fancy-pypi-readme/Makefile @@ -13,17 +13,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-hatchling/Makefile b/devel/py-hatchling/Makefile index c0abbf516bba..cb3905aaced4 100644 --- a/devel/py-hatchling/Makefile +++ b/devel/py-hatchling/Makefile @@ -15,6 +15,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=23.2:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pathspec>=0.10.1:devel/py-pathspec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluggy>=1.0.0:devel/py-pluggy@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}trove-classifiers>=0:devel/py-trove-classifiers@${PY_FLAVOR} USES= python @@ -22,10 +23,4 @@ USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.2.2:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-jupyterlab/Makefile b/devel/py-jupyterlab/Makefile index f8b551d8551b..2badd97b8961 100644 --- a/devel/py-jupyterlab/Makefile +++ b/devel/py-jupyterlab/Makefile @@ -27,6 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}async-lru>=1.0.0:devel/py-async-lru@${PY_FLA ${PYTHON_PKGNAMEPREFIX}notebook-shim>=0.2:devel/py-notebook-shim@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=40.1.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}tornado>=6.2.0:www/py-tornado@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${PY_FLAVOR} @@ -45,8 +46,4 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.4:devel/py-importlib RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.8.3:devel/py-importlib-metadata@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.2.2:textproc/py-tomli@${PY_FLAVOR} -.endif - .include diff --git a/devel/py-maturin/Makefile b/devel/py-maturin/Makefile index fe5e5b7a7cb1..b6c0d403cd8b 100644 --- a/devel/py-maturin/Makefile +++ b/devel/py-maturin/Makefile @@ -15,7 +15,9 @@ LICENSE_FILE_MIT= ${WRKSRC}/license-mit BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.4.0:devel/py-setuptools-rust@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.36.2:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PY_TOMLI} USES= cargo python USE_GITHUB= yes @@ -39,13 +41,6 @@ CARGO_BUILD_ARGS= --no-default-features \ --features=upload,log,human-panic .endif -.include - -.if ${PYTHON_REL} < 31100 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -.endif - post-patch: @${RM} ${WRKSRC}/pyproject.toml ${REINPLACE_CMD} 's|%%PYTHON_VER%%|${PYTHON_VER}|' ${WRKSRC}/maturin/__init__.py @@ -53,4 +48,4 @@ post-patch: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/maturin -.include +.include diff --git a/devel/py-msgspec/Makefile b/devel/py-msgspec/Makefile index 37b24fd22eaa..fffa0b456231 100644 --- a/devel/py-msgspec/Makefile +++ b/devel/py-msgspec/Makefile @@ -24,16 +24,11 @@ USE_PYTHON= autoplist concurrent pep517 OPTIONS_DEFINE= TOML YAML OPTIONS_DEFAULT=TOML YAML -TOML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tomli-w>=0:textproc/py-tomli-w@${PY_FLAVOR} +TOML_RUN_DEPENDS= ${PY_TOMLI} \ + ${PYTHON_PKGNAMEPREFIX}tomli-w>=0:textproc/py-tomli-w@${PY_FLAVOR} YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} -.include - -.if ${PORT_OPTIONS:MTOML} && ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + -.include +.include diff --git a/devel/py-mypy/Makefile b/devel/py-mypy/Makefile index f41fdaea1e68..bbea9a6ceca1 100644 --- a/devel/py-mypy/Makefile +++ b/devel/py-mypy/Makefile @@ -14,11 +14,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mypy_extensions>=1.0.0:devel/py-mypy_extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=40.6.2:devel/py-setuptools@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}types-psutil>=0:devel/py-types-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}types-setuptools>=0:devel/py-types-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6.0:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mypy_extensions>=1.0.0:devel/py-mypy_extensions@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.1.0:devel/py-typing-extensions@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=18.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}filelock>=3.3.0:sysutils/py-filelock@${PY_FLAVOR} \ @@ -47,11 +49,4 @@ DMYPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=4.0:sysutils/py-psutil@${PY_FL MYPYC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=50:devel/py-setuptools@${PY_FLAVOR} REPORTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} -.include - -.if ${PYTHON_REL} < 31100 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-pdm-build-locked/Makefile b/devel/py-pdm-build-locked/Makefile index 2934e3342330..4ee7e9da58b8 100644 --- a/devel/py-pdm-build-locked/Makefile +++ b/devel/py-pdm-build-locked/Makefile @@ -14,16 +14,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdm-backend>=0:devel/py-pdm-backend@${PY_FLAVOR} +RUN_DEPENDS= ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-pdm/Makefile b/devel/py-pdm/Makefile index c44441acdb1a..8584e2aecbc1 100644 --- a/devel/py-pdm/Makefile +++ b/devel/py-pdm/Makefile @@ -30,6 +30,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}resolvelib1>=1.0.1:devel/py-resolvelib1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rich>=12.3.0:textproc/py-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}shellingham>=1.3.2:devel/py-shellingham@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}tomlkit>=0.11.1<1:textproc/py-tomlkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unearth>=0.16.0:devel/py-unearth@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=20:devel/py-virtualenv@${PY_FLAVOR} @@ -61,8 +62,4 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=3.6:devel/py-importlib- RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}truststore>=0:security/py-truststore@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -.endif - .include diff --git a/devel/py-pep517/Makefile b/devel/py-pep517/Makefile index e9630d5d055d..6c20cba78b7d 100644 --- a/devel/py-pep517/Makefile +++ b/devel/py-pep517/Makefile @@ -13,16 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=2<4:devel/py-flit-core@${PY_FLAVOR} +RUN_DEPENDS= ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-pip-run/Makefile b/devel/py-pip-run/Makefile index ba84502e9011..03ff02dc6a0a 100644 --- a/devel/py-pip-run/Makefile +++ b/devel/py-pip-run/Makefile @@ -23,7 +23,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autocommand>=0:devel/py-autocommand@${PY_FLA ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}path>=15.1:devel/py-path@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=19.3:devel/py-pip@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}platformdirs>=0:devel/py-platformdirs@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}platformdirs>=0:devel/py-platformdirs@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 @@ -36,8 +37,4 @@ NO_ARCH= yes RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - .include diff --git a/devel/py-pip-tools/Makefile b/devel/py-pip-tools/Makefile index b1f3525033d5..e477da20556d 100644 --- a/devel/py-pip-tools/Makefile +++ b/devel/py-pip-tools/Makefile @@ -19,6 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=1.0.0:devel/py-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=22.2:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject_hooks>=0:devel/py-pyproject_hooks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} USES= python @@ -26,10 +27,4 @@ USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-pipx/Makefile b/devel/py-pipx/Makefile index 8bd256884ea9..da27cf3c1d75 100644 --- a/devel/py-pipx/Makefile +++ b/devel/py-pipx/Makefile @@ -16,6 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0.4:devel/py-hatch-vcs@${PY_FLA RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=1.9.4:devel/py-argcomplete@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=2.1:devel/py-platformdirs@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}userpath>=1.6:devel/py-userpath@${PY_FLAVOR} USES= python @@ -23,10 +24,4 @@ USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-poetry/Makefile b/devel/py-poetry/Makefile index 52192264ee67..a70a14917953 100644 --- a/devel/py-poetry/Makefile +++ b/devel/py-poetry/Makefile @@ -31,6 +31,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=1.0.3<2:devel/py-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.26<3:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=1.0.0<2:www/py-requests-toolbelt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}shellingham>=1.5<2:devel/py-shellingham@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}tomlkit>=0.11.4<1.0.0:textproc/py-tomlkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}trove-classifiers>=2022.5.19:devel/py-trove-classifiers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=20.23.0<21:devel/py-virtualenv@${PY_FLAVOR} @@ -61,8 +62,4 @@ FILECACHE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.14.0<0.15:www/py-c RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.4:devel/py-importlib-metadata@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1<3:textproc/py-tomli@${PY_FLAVOR} -.endif - .include diff --git a/devel/py-pre-commit-hooks/Makefile b/devel/py-pre-commit-hooks/Makefile index 928acd14a525..be1b51db5c13 100644 --- a/devel/py-pre-commit-hooks/Makefile +++ b/devel/py-pre-commit-hooks/Makefile @@ -15,17 +15,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15:devel/py-ruamel.yaml@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15:devel/py-ruamel.yaml@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-pyproject-flake8/Makefile b/devel/py-pyproject-flake8/Makefile index cd43d3388366..03ef5618d67c 100644 --- a/devel/py-pyproject-flake8/Makefile +++ b/devel/py-pyproject-flake8/Makefile @@ -14,17 +14,12 @@ LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>=3.2<4:devel/py-flit-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=7.0.0:devel/py-flake8@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=7.0.0:devel/py-flake8@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-pyproject-fmt/Makefile b/devel/py-pyproject-fmt/Makefile index cdcc87166d2d..8ad6fa527326 100644 --- a/devel/py-pyproject-fmt/Makefile +++ b/devel/py-pyproject-fmt/Makefile @@ -14,17 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0.4:devel/py-hatch-vcs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>=1.25:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyproject-fmt-rust>=1.1.5<1.1.5_99:devel/py-pyproject-fmt-rust@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyproject-fmt-rust>=1.1.5<1.1.5_99:devel/py-pyproject-fmt-rust@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile index da890b6070a2..bbc7d4b4e8bd 100644 --- a/devel/py-pytest/Makefile +++ b/devel/py-pytest/Makefile @@ -18,7 +18,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FL RUN_DEPENDS= ${PY_EXCEPTIONGROUP} \ ${PYTHON_PKGNAMEPREFIX}iniconfig>=0:devel/py-iniconfig@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pluggy>=1.4<2.0:devel/py-pluggy@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pluggy>=1.4<2.0:devel/py-pluggy@${PY_FLAVOR} \ + ${PY_TOMLI} TEST_DEPENDS= bash:shells/bash \ lsof:sysutils/lsof \ ${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${PY_FLAVOR} \ @@ -44,14 +45,8 @@ NO_ARCH= yes CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pytest4 -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1:textproc/py-tomli@${PY_FLAVOR} -.endif - # XXX: test_pdb_custom_cls_with_set_trace fails do-test: cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -.include +.include diff --git a/devel/py-responses/Makefile b/devel/py-responses/Makefile index 121c62d42b7f..0bb5292bf6d2 100644 --- a/devel/py-responses/Makefile +++ b/devel/py-responses/Makefile @@ -24,6 +24,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=6.0.0:devel/py-coverage@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-httpserver>=0:devel/py-pytest-httpserver@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}tomli-w>=0:textproc/py-tomli-w@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}types-PyYAML>=0:devel/py-types-PyYAML@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}types-requests>=0:devel/py-types-requests@${PY_FLAVOR} @@ -33,10 +34,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-scikit-build-core/Makefile b/devel/py-scikit-build-core/Makefile index 8f86276f3437..d40ebb857292 100644 --- a/devel/py-scikit-build-core/Makefile +++ b/devel/py-scikit-build-core/Makefile @@ -20,17 +20,14 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>=0:devel/py-hatch- ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} RUN_DEPENDS= ${PY_EXCEPTIONGROUP} \ ${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pathspec>=0.10.1:devel/py-pathspec@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pathspec>=0.10.1:devel/py-pathspec@${PY_FLAVOR} \ + ${PY_TOMLI} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=0.1:devel/py-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cattrs>=22.2.0:devel/py-cattrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pybind11>=0:devel/py-pybind11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject-metadata>=0.5:devel/py-pyproject-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-subprocess>=1.5:devel/py-pytest-subprocess@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -py39_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}exceptiongroup>0:devel/py-exceptiongroup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tomli>=1.2.2:textproc/py-tomli@${PY_FLAVOR} -py310_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}exceptiongroup>0:devel/py-exceptiongroup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tomli>=1.2.2:textproc/py-tomli@${PY_FLAVOR} USES= python:3.9+ USE_PYTHON= pep517 autoplist pytest diff --git a/devel/py-setuptools-rust/Makefile b/devel/py-setuptools-rust/Makefile index 5b434f5f2d47..3f2a46428260 100644 --- a/devel/py-setuptools-rust/Makefile +++ b/devel/py-setuptools-rust/Makefile @@ -14,19 +14,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=62.4:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}semantic-version>=2.8.2<3:devel/py-semantic-version@${PY_FLAVOR} \ +RUN_DEPENDS= cargo:lang/rust \ + ${PYTHON_PKGNAMEPREFIX}semantic-version>=2.8.2<3:devel/py-semantic-version@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=62.4:devel/py-setuptools@${PY_FLAVOR} \ - cargo:lang/rust + ${PY_TOMLI} USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 31100 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.2.1:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-setuptools-scm/Makefile b/devel/py-setuptools-scm/Makefile index 6dc5bb6a92c5..619363af1cae 100644 --- a/devel/py-setuptools-scm/Makefile +++ b/devel/py-setuptools-scm/Makefile @@ -12,8 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=20:devel/py-packaging@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rich>0:textproc/py-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ @@ -39,14 +41,7 @@ PYTEST_IGNORED_TESTS= test_dump_version_on_old_python \ test_not_owner \ test_case_mismatch_on_windows_git -.include - -.if ${PYTHON_REL} < 31100 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1:textproc/py-tomli@${PY_FLAVOR} -.endif - post-patch: @${REINPLACE_CMD} -e '497,521s|"gpg|"gpg2|' ${WRKSRC}/testing/test_git.py -.include +.include diff --git a/devel/py-setuptools_scm7/Makefile b/devel/py-setuptools_scm7/Makefile index 305a91317988..0b072f383c76 100644 --- a/devel/py-setuptools_scm7/Makefile +++ b/devel/py-setuptools_scm7/Makefile @@ -15,10 +15,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} - RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ + ${PY_TOMLI} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ @@ -47,11 +48,4 @@ PYTEST_IGNORED_TESTS= test_case_mismatch_on_windows_git \ # https://github.com/pypa/setuptools_scm/issues/449 PYTEST_BROKEN_TESTS= test_non_dotted_version -.include - -.if ${PYTHON_REL} < 31100 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile index 79cdefccb83e..c9144716f5fd 100644 --- a/devel/py-sip/Makefile +++ b/devel/py-sip/Makefile @@ -21,7 +21,8 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPL3 BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ + ${PY_TOMLI} USES= python pyqt:sip USE_PYTHON= autoplist concurrent pep517 @@ -29,10 +30,4 @@ USE_PYQT= # NO_ARCH= yes -.include - *** 275 LINES SKIPPED ***