diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-04-26 14:57:49 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-04-26 15:01:54 +0000 |
| commit | d1e78c491a9108f93a73d2a7391cc5b876a2f32d (patch) | |
| tree | 09b29a004499bb8b8339e21fc87cde96369f0a69 | |
| parent | 135457556095cce4a24d9a530069f1ae89452d18 (diff) | |
| download | ports-d1e78c491a9108f93a73d2a7391cc5b876a2f32d.tar.gz ports-d1e78c491a9108f93a73d2a7391cc5b876a2f32d.zip | |
devel/py-tox: Fix RUN_DEPENDS after cd1f80795973dc010a788cdbf90cece3473e36f4
- Fix RUN_DEPENDS version requirement of RUN_DEPENDS [1]
- While I'm here:
- Fix (part of) version requirement of TEST_DEPENDS [2][3][4]
- Remove superfluous ',' in *_DEPENDS
- Use PYTHON_REL instead of PYTHON_VER
Note that TEST_DEPENDS needs to be updated to match upstream and current ports tree.
Reference: https://github.com/tox-dev/tox/blob/3.25.0/setup.cfg#L46 [1]
https://github.com/tox-dev/tox/blob/3.25.0/setup.cfg#L71 [2]
https://github.com/tox-dev/tox/blob/3.25.0/setup.cfg#L72 [3]
https://github.com/tox-dev/tox/blob/3.25.0/setup.cfg#L74 [4]
| -rw-r--r-- | devel/py-tox/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile index 8799e8a846b4..7d7986ddad3f 100644 --- a/devel/py-tox/Makefile +++ b/devel/py-tox/Makefile @@ -13,18 +13,18 @@ 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<4:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=14:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pluggy>=0.12.0,<1: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}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}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,<1:devel/py-freezegun@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>=1.10.0,<2:devel/py-pytest-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.22.2,<2:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest>=4.0.0,<5:devel/py-pytest@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.11:devel/py-freezegun@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>=1.10.0:devel/py-pytest-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.22.2:devel/py-pytest-xdist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=4.0.0,1:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -33,7 +33,7 @@ NO_ARCH= yes .include <bsd.port.pre.mk> -.if ${PYTHON_VER} < 3.8 +.if ${PYTHON_REL} < 30800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR} .endif |