Attachment #226076 for bug #256624

Lines 4934-4939 Link Here

(-)b/devel/Makefile (+1 lines)
4934	SUBDIR += py-pystorm	4934	SUBDIR += py-pystorm
4935	SUBDIR += py-pyte	4935	SUBDIR += py-pyte
4936	SUBDIR += py-pytest	4936	SUBDIR += py-pytest
		4937	SUBDIR += py-pytest4
4937	SUBDIR += py-pytest-aiohttp	4938	SUBDIR += py-pytest-aiohttp
4938	SUBDIR += py-pytest-asyncio	4939	SUBDIR += py-pytest-asyncio
4939	SUBDIR += py-pytest-azurepipelines	4940	SUBDIR += py-pytest-azurepipelines

Lines 11-17 COMMENT= Relaxed test discovery/organization for pytest Link Here

(-)b/devel/py-pytest-relaxed/Makefile (-1 / +1 lines)
11	LICENSE= BSD2CLAUSE	11	LICENSE= BSD2CLAUSE
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3<5:devel/py-pytest@${PY_FLAVOR} \	14	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest4>=3<5:devel/py-pytest4@${PY_FLAVOR} \
15	${PYTHON_PKGNAMEPREFIX}six>=1<2:devel/py-six@${PY_FLAVOR} \	15	${PYTHON_PKGNAMEPREFIX}six>=1<2:devel/py-six@${PY_FLAVOR} \
16	${PYTHON_PKGNAMEPREFIX}decorator4>=4<5:devel/py-decorator4@${PY_FLAVOR}	16	${PYTHON_PKGNAMEPREFIX}decorator4>=4<5:devel/py-decorator4@${PY_FLAVOR}
17		17




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+
USE_PYTHON=	autoplist concurrent distutils

NO_ARCH=	yes
CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pytest4

.include <bsd.port.pre.mk>


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




PORTNAME=	pytest
PORTVERSION=	4.6.11
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX=	4

MAINTAINER=	python@FreeBSD.org
COMMENT=	Simple powerful testing with Python

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.0:devel/py-atomicwrites@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}attrs>=17.4.0:devel/py-attrs@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}more-itertools>=4.0.0:devel/py-more-itertools@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
		${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}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR}
TEST_DEPENDS=	bash:shells/bash \
		lsof:sysutils/lsof \
		${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}hypothesis>=3.56:devel/py-hypothesis@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
		${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}unittest2>=0:devel/py-unittest2@${PY_FLAVOR}

USES=		python:3.6+
USE_PYTHON=	autoplist concurrent distutils

NO_ARCH=	yes
CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pytest

.include <bsd.port.pre.mk>

.if ${PYTHON_REL} < 30800
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 -k 'not test_cache_failure_warns'

.include <bsd.port.post.mk>

Added Link Here

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




The pytest testing tool makes it easy to write small tests, yet scales to
support complex functional testing.

Features:

  * Detailed info on failing assert statements
  * Auto-discovery of test modules and functions
  * Modular fixtures to manage small or parametrized long-lived test resources
  * Can run unittest (or trial), nose test suites out of the box
  * Rich plugin architecture, with over 315+ external plugins

WWW: https://docs.pytest.org/en/latest/

Return to bug 256624

Lines 1-5 Link Here

(-)b/devel/py-pytest/Makefile (-8 / +5 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-44 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+
39	USE_PYTHON= autoplist concurrent distutils	40	USE_PYTHON= autoplist concurrent distutils
40		41
41	NO_ARCH= yes	42	NO_ARCH= yes
		43	CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pytest4
42		44
43	.include <bsd.port.pre.mk>	45	.include <bsd.port.pre.mk>
44		46
Lines 46-57 NO_ARCH= yes Link Here
46	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR}	48	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR}
47	.endif	49	.endif
48		50
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:	51	do-test:
55	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -k 'not test_cache_failure_warns'	52	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
56		53
57	.include <bsd.port.post.mk>	54	.include <bsd.port.post.mk>

Added Link Here

(-)b/devel/py-pytest4/Makefile (+59 lines)
1	PORTNAME= pytest
2	PORTVERSION= 4.6.11
3	CATEGORIES= devel python
4	MASTER_SITES= CHEESESHOP
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6	PKGNAMESUFFIX= 4
7
8	MAINTAINER= python@FreeBSD.org
9	COMMENT= Simple powerful testing with Python
10
11	LICENSE= MIT
12	LICENSE_FILE= ${WRKSRC}/LICENSE
13
14	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.0:devel/py-atomicwrites@${PY_FLAVOR} \
16	${PYTHON_PKGNAMEPREFIX}attrs>=17.4.0:devel/py-attrs@${PY_FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}more-itertools>=4.0.0:devel/py-more-itertools@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}pluggy>=0.12<1.0:devel/py-pluggy@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}py>=1.5.0:devel/py-py@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR}
23	TEST_DEPENDS= bash:shells/bash \
24	lsof:sysutils/lsof \
25	${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}hypothesis>=3.56:devel/py-hypothesis@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
30	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
31	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
32	${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
33	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
34	${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${PY_FLAVOR} \
35	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
36	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
37	${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${PY_FLAVOR}
38
39	USES= python:3.6+
40	USE_PYTHON= autoplist concurrent distutils
41
42	NO_ARCH= yes
43	CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pytest
44
45	.include <bsd.port.pre.mk>
46
47	.if ${PYTHON_REL} < 30800
48	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.12:devel/py-importlib-metadata@${PY_FLAVOR}
49	.endif
50
51	post-patch:
52	@${REINPLACE_CMD} -e 's\|%%PYTHON_CMD%%\|${PYTHON_CMD}\|' ${WRKSRC}/testing/test_parseopt.py
53
54	# test_cache_failure_warns fails
55	# https://github.com/pytest-dev/pytest/issues/1845
56	do-test:
57	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -k 'not test_cache_failure_warns'
58
59	.include <bsd.port.post.mk>

Added Link Here

(-)b/devel/py-pytest4/pkg-descr (+12 lines)
1	The pytest testing tool makes it easy to write small tests, yet scales to
2	support complex functional testing.
3
4	Features:
5
6	* Detailed info on failing assert statements
7	* Auto-discovery of test modules and functions
8	* Modular fixtures to manage small or parametrized long-lived test resources
9	* Can run unittest (or trial), nose test suites out of the box
10	* Rich plugin architecture, with over 315+ external plugins
11
12	WWW: https://docs.pytest.org/en/latest/