git: 4fcb4e227429 - main - devel/py-tox: Fix RUN_DEPENDS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 30 Jun 2023 07:23:07 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4fcb4e2274295e334cee771669d24206b92a404a
commit 4fcb4e2274295e334cee771669d24206b92a404a
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-06-30 07:08:29 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-06-30 07:08:29 +0000
devel/py-tox: Fix RUN_DEPENDS
- Remove py-toml from RUN_DEPENDS (toml>=0.10.2;python_version<="3.6")
- Add PYTHON_REL check for py-tomli (tomli>=2.0.1;python_version>="3.7" and python_version<"3.11")
- Update version requirement of RUN_DEPENDS
- Bump PORTREVISION for dependency change
Reference: https://github.com/tox-dev/tox/blob/3.28.0/setup.cfg#L36-L46
Approved by: portmgr (blanket)
With hat: python
---
devel/py-tox/Makefile | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile
index 53a42ad1cbac..127504b06ffc 100644
--- a/devel/py-tox/Makefile
+++ b/devel/py-tox/Makefile
@@ -1,6 +1,6 @@
PORTNAME= tox
PORTVERSION= 3.28.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,13 +13,11 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>=3.0.0<4:sysutils/py-filelock@${PY_FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>=3.0.0:sysutils/py-filelock@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}packaging>=14:devel/py-packaging@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pluggy>=0.12.0:devel/py-pluggy@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}py>=1.4.17<2:devel/py-py@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.14.0<2:devel/py-six@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}toml>=0.9.4:textproc/py-toml@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py-py@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}virtualenv>=16.0.0:devel/py-virtualenv@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flaky>=3.4.0:devel/py-flaky@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.11:devel/py-freezegun@${PY_FLAVOR} \
@@ -31,8 +29,14 @@ USE_PYTHON= autoplist concurrent distutils pytest4
NO_ARCH= yes
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 31100
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1:textproc/py-tomli@${PY_FLAVOR}
+.endif
+
# tox.ini clobbers our pytest arguments
post-extract:
${RM} ${WRKSRC}/tox.ini
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>