From b30b903ef2e0d93fec49f9876f46896a442bfc5e Mon Sep 17 00:00:00 2001 From: Matthew Seaman Date: Fri, 21 Sep 2018 13:26:40 +0000 Subject: [PATCH] Fix the ordering of {BUILD,RUN,TEST}_DEPENDS (1, 2) Avoid tox, as it doesn't play well with poudriere. (2) Reported by: (1) mat, (2) koobs --- devel/py-git-url-parse/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/devel/py-git-url-parse/Makefile b/devel/py-git-url-parse/Makefile index b4b081471d07..b845906dd0b6 100644 --- a/devel/py-git-url-parse/Makefile +++ b/devel/py-git-url-parse/Makefile @@ -12,15 +12,14 @@ COMMENT= Simple git URL parser LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>0:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yapf>=0.21.0:textproc/py-yapf@${PY_FLAVOR} -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils @@ -28,6 +27,6 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes do-test: - @cd ${WRKSRC} && ${LOCALBASE}/bin/tox-${PYTHON_VER} -e py${PYTHON_SUFFIX} + @cd ${WRKSRC} && ${LOCALBASE}/bin/py.test-${PYTHON_VER} -vv .include