View | Details | Raw Unified | Return to bug 256624 | Differences between
and this patch

Collapse All | Expand All

(-)devel/py-pytest-asyncio/Makefile (-3 / +13 lines)
Lines 1-5 Link Here
1
PORTNAME=	pytest-asyncio
1
PORTNAME=	pytest-asyncio
2
PORTVERSION=	0.10.0
2
PORTVERSION=	0.18.2
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 11-20 LICENSE= APACHE20 Link Here
11
11
12
CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pytest4-asyncio
12
CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pytest4-asyncio
13
13
14
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.0.6:devel/py-pytest@${PY_FLAVOR}
14
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=6.1.0:devel/py-pytest@${PY_FLAVOR}
15
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR}
15
16
16
NO_ARCH=	yes
17
NO_ARCH=	yes
17
USES=		python:3.5+
18
USES=		python:3.5+
18
USE_PYTHON=	autoplist distutils
19
USE_PYTHON=	autoplist distutils
19
20
20
.include <bsd.port.mk>
21
.include <bsd.port.pre.mk>
22
23
.if ${PYTHON_REL} < 30800
24
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
25
.endif
26
27
do-test:
28
	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
29
30
.include <bsd.port.post.mk>
(-)devel/py-pytest-asyncio/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1546907123
1
TIMESTAMP = 1648048464
2
SHA256 (pytest-asyncio-0.10.0.tar.gz) = 9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf
2
SHA256 (pytest-asyncio-0.18.2.tar.gz) = fc8e4190f33fee7797cc7f1829f46a82c213f088af5d1bb5d4e454fe87e6cdc2
3
SIZE (pytest-asyncio-0.10.0.tar.gz) = 11765
3
SIZE (pytest-asyncio-0.18.2.tar.gz) = 32091
(-)devel/py-pytest/Makefile (-16 / +13 lines)
Lines 1-5 Link Here
1
PORTNAME=	pytest
1
PORTNAME=	pytest
2
PORTVERSION=	4.6.11
2
PORTVERSION=	7.1.1
3
PORTEPOCH=	1
3
PORTEPOCH=	1
4
CATEGORIES=	devel python
4
CATEGORIES=	devel python
5
MASTER_SITES=	CHEESESHOP
5
MASTER_SITES=	CHEESESHOP
Lines 14-27 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
14
CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pytest4
14
CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pytest4
15
15
16
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
16
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
17
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.0:devel/py-atomicwrites@${PY_FLAVOR} \
17
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}attrs>=17.4.0:devel/py-attrs@${PY_FLAVOR} \
19
		${PYTHON_PKGNAMEPREFIX}more-itertools>=4.0.0:devel/py-more-itertools@${PY_FLAVOR} \
20
		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
21
		${PYTHON_PKGNAMEPREFIX}pluggy>=0.12<1.0:devel/py-pluggy@${PY_FLAVOR} \
19
		${PYTHON_PKGNAMEPREFIX}pluggy>=0.12<1.0:devel/py-pluggy@${PY_FLAVOR} \
22
		${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \
20
		${PYTHON_PKGNAMEPREFIX}py>=1.8.2:devel/py-py@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
21
		${PYTHON_PKGNAMEPREFIX}tomli>=0:textproc/py-toml@${PY_FLAVOR} \
24
		${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR}
22
		${PYTHON_PKGNAMEPREFIX}iniconfig>=0:devel/py-iniconfig@${PY_FLAVOR}
25
TEST_DEPENDS=	bash:shells/bash \
23
TEST_DEPENDS=	bash:shells/bash \
26
		lsof:sysutils/lsof \
24
		lsof:sysutils/lsof \
27
		${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${PY_FLAVOR} \
25
		${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${PY_FLAVOR} \
Lines 32-60 TEST_DEPENDS= bash:shells/bash \ Link Here
32
		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
30
		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
33
		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
31
		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
34
		${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
32
		${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
35
		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
36
		${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} \
37
		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
34
		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
35
		${PYTHON_PKGNAMEPREFIX}xmlschema>=0:textproc/py-xmlschema@${PY_FLAVOR} \
38
		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
36
		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
39
		${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR}
37
		${PYTHON_PKGNAMEPREFIX}asynctest>=0:devel/py-asynctest@${PY_FLAVOR} \
38
		${PYTHON_PKGNAMEPREFIX}pygments>=2.7.2:textproc/py-pygments@${PY_FLAVOR}
40
39
41
USES=		python:3.6+
40
USES=		python:3.7+
42
USE_PYTHON=	autoplist concurrent distutils
41
USE_PYTHON=	autoplist concurrent distutils
43
42
44
NO_ARCH=	yes
43
NO_ARCH=	yes
45
44
45
TEST_ENV=	PYTHONPATH="${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}"
46
46
.include <bsd.port.pre.mk>
47
.include <bsd.port.pre.mk>
47
48
48
.if ${PYTHON_REL} < 30800
49
.if ${PYTHON_REL} < 30800
49
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR}
50
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR}
50
.endif
51
.endif
51
52
52
post-patch:
53
# XXX: test_pdb_custom_cls_with_set_trace fails
53
	@${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/testing/test_parseopt.py
54
55
# test_cache_failure_warns fails
56
# https://github.com/pytest-dev/pytest/issues/1845
57
do-test:
54
do-test:
58
	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -k 'not test_cache_failure_warns'
55
	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
59
56
60
.include <bsd.port.post.mk>
57
.include <bsd.port.post.mk>
(-)devel/py-pytest/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1620405525
1
TIMESTAMP = 1648037418
2
SHA256 (pytest-4.6.11.tar.gz) = 50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353
2
SHA256 (pytest-7.1.1.tar.gz) = 841132caef6b1ad17a9afde46dc4f6cfa59a05f9555aae5151f73bdf2820ca63
3
SIZE (pytest-4.6.11.tar.gz) = 952305
3
SIZE (pytest-7.1.1.tar.gz) = 1255528
(-)devel/py-pytest/files/patch-testing-test_parseopt.py (-11 lines)
Removed Link Here
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