Attachment #225833 for bug #256624




PORTNAME=	pytest
PORTVERSION=	6.2.4
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

		${PYTHON_PKGNAMEPREFIX}pluggy>=0.12<1.0:devel/py-pluggy@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}iniconfig>=0:devel/py-iniconfig@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR}
TEST_DEPENDS=	bash:shells/bash \
		lsof:sysutils/lsof \

		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}xmlschema>=0:textproc/py-xmlschema@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR}

USES=		python:3.6+

RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR}
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/testing/test_parseopt.py

# test_cache_failure_warns fails
# https://github.com/pytest-dev/pytest/issues/1845
do-test:
	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/devel/py-pytest/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620405525	1	TIMESTAMP = 1623756059
2	SHA256 (pytest-4.6.11.tar.gz) = 50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353	2	SHA256 (pytest-6.2.4.tar.gz) = 50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b
3	SIZE (pytest-4.6.11.tar.gz) = 952305	3	SIZE (pytest-6.2.4.tar.gz) = 1118084

Removed Link Here

(-)a/devel/py-pytest/files/patch-testing-test_parseopt.py (-11 lines)
1	--- testing/test_parseopt.py.orig 2020-06-05 12:09:03 UTC
2	+++ testing/test_parseopt.py
3	@@ -305,7 +305,7 @@ def test_argcomplete(testdir, monkeypatch):
4	# redirect output from argcomplete to stdin and stderr is not trivial
5	# http://stackoverflow.com/q/12589419/1307905
6	# so we use bash
7	- fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" python -m pytest 8>&1 9>&2')
8	+ fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" %%PYTHON_CMD%% -m pytest 8>&1 9>&2')
9	# alternative would be exteneded Testdir.{run(),_run(),popen()} to be able
10	# to handle a keyword argument env that replaces os.environ in popen or
11	# extends the copy, advantage: could not forget to restore

Return to bug 256624

Lines 1-5 Link Here

(-)b/devel/py-pytest/Makefile (-8 / +4 lines)
1	PORTNAME= pytest	1	PORTNAME= pytest
2	PORTVERSION= 4.6.11	2	PORTVERSION= 6.2.4
3	CATEGORIES= devel python	3	CATEGORIES= devel python
4	MASTER_SITES= CHEESESHOP	4	MASTER_SITES= CHEESESHOP
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 18-23 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.0:devel/py-atomicwrites@${PY Link Here
18	${PYTHON_PKGNAMEPREFIX}pluggy>=0.12<1.0:devel/py-pluggy@${PY_FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}pluggy>=0.12<1.0:devel/py-pluggy@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \	19	${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \	20	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
		21	${PYTHON_PKGNAMEPREFIX}iniconfig>=0:devel/py-iniconfig@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR}	22	${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR}
22	TEST_DEPENDS= bash:shells/bash \	23	TEST_DEPENDS= bash:shells/bash \
23	lsof:sysutils/lsof \	24	lsof:sysutils/lsof \
Lines 29-38 TEST_DEPENDS= bash:shells/bash \ Link Here
29	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \	30	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
30	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \	31	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
31	${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \	32	${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
32	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
33	${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${PY_FLAVOR} \	33	${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${PY_FLAVOR} \
34	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \	34	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
35	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \	35	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
		36	${PYTHON_PKGNAMEPREFIX}xmlschema>=0:textproc/py-xmlschema@${PY_FLAVOR} \
36	${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR}	37	${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR}
37		38
38	USES= python:3.6+	39	USES= python:3.6+
Lines 46-57 NO_ARCH= yes Link Here
46	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR}	47	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR}
47	.endif	48	.endif
48		49
49	post-patch:
50	@${REINPLACE_CMD} -e 's\|%%PYTHON_CMD%%\|${PYTHON_CMD}\|' ${WRKSRC}/testing/test_parseopt.py
51
52	# test_cache_failure_warns fails
53	# https://github.com/pytest-dev/pytest/issues/1845
54	do-test:	50	do-test:
55	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -k 'not test_cache_failure_warns'	51	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
56		52
57	.include <bsd.port.post.mk>	53	.include <bsd.port.post.mk>