Attachment 172675 Details for Bug 211174 – partial fix

[patch] partial fix

py-flask-restplus.make-test.diff (text/plain), 2.86 KB, created by Jan Beich on 2016-07-18 19:25:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-07-18 19:25:38 UTC

Size: 2.86 KB

patch

obsolete

>commit a202b2c
>Author: Jan Beich <jbeich@FreeBSD.org>
>Date:   Mon Jul 18 17:52:36 2016 +0000
>
>    www/py-flask-restplus: partially fix |make test|
>    
>    PR:             211174
>    Approved by:    ?
>---
> www/py-flask-restplus/Makefile   | 18 ++++++++++--------
> www/py-flask-restplus08/Makefile | 18 ++++++++++--------
> 2 files changed, 20 insertions(+), 16 deletions(-)
>
>diff --git www/py-flask-restplus/Makefile www/py-flask-restplus/Makefile
>index 9d9ec3d..f0444dc 100644
>--- www/py-flask-restplus/Makefile
>+++ www/py-flask-restplus/Makefile
>@@ -17,12 +17,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask \
> 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601
>-
>-TEST_DEPENDS:=	${RUN_DEPENDS} \
>-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
>-		${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose \
>-		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
>-		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
>+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
> 
> CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}flask-restplus08
> 
>@@ -30,7 +26,13 @@ USES=		python
> USE_PYTHON=	autoplist distutils
> NO_ARCH=	yes
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${PYTHON_REL} < 3300
>+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
>+.endif
>+
> do-test:
>-	@(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test)
>+	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff --git www/py-flask-restplus08/Makefile www/py-flask-restplus08/Makefile
>index 7bf3c2c..28542a0 100644
>--- www/py-flask-restplus08/Makefile
>+++ www/py-flask-restplus08/Makefile
>@@ -18,12 +18,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.2:www/py-flask-restful \
> 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
> 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
> 		${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601
>-
>-TEST_DEPENDS:=	${RUN_DEPENDS} \
>-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
>-		${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose \
>-		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \
>-		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
>+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
> 
> CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}flask-restplus
> PORTSCOUT=	limit:^0\.8
>@@ -32,7 +28,13 @@ USES=		python
> USE_PYTHON=	autoplist distutils
> NO_ARCH=	yes
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${PYTHON_REL} < 3300
>+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
>+.endif
>+
> do-test:
>-	@(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test)
>+	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 211174: 172608 | 172609 | 172675 | 172731 | 172732