Attachment #225488 for bug #256219




# Created by: Kubilay Kocak <koobs@FreeBSD.org>

PORTNAME=	aiohttp
DISTVERSION=	3.7.4.post0
PORTREVISION=	1
CATEGORIES=	www python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

LICENSE_FILE=	${WRKSRC}/LICENSE.txt

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=17.3.0:devel/py-attrs@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}chardet>=2.0<5.0,1:textproc/py-chardet@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}multidict>=4.5<7.0:www/py-multidict@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}async_timeout>=3.0<4.0:devel/py-async_timeout@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}yarl>=1.0<2.0:www/py-yarl@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.5:devel/py-typing-extensions@${PY_FLAVOR}
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.8.2:devel/py-pytest@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \

# to be ported	${PYTHON_PKGNAMEPREFIX}brotlypy>0:archivers/py-brotlipy@${PY_FLAVOR}
# to be ported	${PYTHON_PKGNAMEPREFIX}trustme>0:security/py-trustme@${PY_FLAVOR}

USES=		python:3.6+
USES=		python:3.5+
USE_PYTHON=	autoplist distutils cython

.include <bsd.port.pre.mk>

.if ${PYTHON_REL} < 30700
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}idna_ssl>=1.0:dns/py-idna_ssl@${PY_FLAVOR}
		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.5:devel/py-typing-extensions@${PY_FLAVOR}
.endif

pre-configure:

Lines 1-3 Link Here

(-)b/www/py-aiohttp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1592851297	1	TIMESTAMP = 1622602368
2	SHA256 (aiohttp-3.6.2.tar.gz) = 259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326	2	SHA256 (aiohttp-3.7.4.post0.tar.gz) = 493d3299ebe5f5a7c66b9819eacdcfbbaaf1a8e84911ddffcdc48888497afecf
3	SIZE (aiohttp-3.6.2.tar.gz) = 1076923	3	SIZE (aiohttp-3.7.4.post0.tar.gz) = 1114888




Obtained from:	https://github.com/aio-libs/aiohttp/commit/d7db1b90c59ae49660d5b469f6186d088a6d190d

--- setup.py.orig	2019-10-09 16:52:31 UTC
+++ setup.py
@@ -74,7 +74,7 @@ except IndexError:
 install_requires = [
     'attrs>=17.3.0',
     'chardet>=2.0,<4.0',
-    'multidict>=4.5,<5.0',
+    'multidict>=4.5,<6.0',
     'async_timeout>=3.0,<4.0',
     'yarl>=1.0,<2.0',
     'idna-ssl>=1.0; python_version<"3.7"',
@@ -104,9 +104,12 @@ NEEDS_PYTEST = {'pytest', 'test'}.intersection(sys.arg
 pytest_runner = ['pytest-runner'] if NEEDS_PYTEST else []
 
 tests_require = [
-    'pytest', 'gunicorn',
+    'pytest>=3.8.2', 'gunicorn',
     'pytest-timeout', 'async-generator',
     'pytest-xdist',
+    'pytest-mock',
+    'trustme',
+    'brotlipy',
 ]
 
 

Return to bug 256219

Lines 1-8 Link Here

(-)b/www/py-aiohttp/Makefile (-9 / +7 lines)
1	# Created by: Kubilay Kocak <koobs@FreeBSD.org>	1	# Created by: Kubilay Kocak <koobs@FreeBSD.org>
2		2
3	PORTNAME= aiohttp	3	PORTNAME= aiohttp
4	PORTVERSION= 3.6.2	4	DISTVERSION= 3.7.4.post0
5	PORTREVISION= 1
6	CATEGORIES= www python	5	CATEGORIES= www python
7	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 14-23 LICENSE= APACHE20 Link Here
14	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	13	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
15		14
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=17.3.0:devel/py-attrs@${PY_FLAVOR} \	15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=17.3.0:devel/py-attrs@${PY_FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}chardet>=2.0<4.0,1:textproc/py-chardet@${PY_FLAVOR} \	16	${PYTHON_PKGNAMEPREFIX}chardet>=2.0<5.0,1:textproc/py-chardet@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}multidict>=4.5:www/py-multidict@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}multidict>=4.5<7.0:www/py-multidict@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}async_timeout>=3.0<4.0:devel/py-async_timeout@${PY_FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}async_timeout>=3.0<4.0:devel/py-async_timeout@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}yarl>=1.0<2.0:www/py-yarl@${PY_FLAVOR}	19	${PYTHON_PKGNAMEPREFIX}yarl>=1.0<2.0:www/py-yarl@${PY_FLAVOR} \
		20	${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.5:devel/py-typing-extensions@${PY_FLAVOR}
21	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.8.2:devel/py-pytest@${PY_FLAVOR} \	21	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.8.2:devel/py-pytest@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
Lines 30-44 TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.8.2:devel/py-pytest@${PY_FLAVOR} Link Here
30	# to be ported ${PYTHON_PKGNAMEPREFIX}brotlypy>0:archivers/py-brotlipy@${PY_FLAVOR}	30	# to be ported ${PYTHON_PKGNAMEPREFIX}brotlypy>0:archivers/py-brotlipy@${PY_FLAVOR}
31	# to be ported ${PYTHON_PKGNAMEPREFIX}trustme>0:security/py-trustme@${PY_FLAVOR}	31	# to be ported ${PYTHON_PKGNAMEPREFIX}trustme>0:security/py-trustme@${PY_FLAVOR}
32		32
33	# Actually 3.5.3+	33	USES= python:3.6+
34	USES= python:3.5+
35	USE_PYTHON= autoplist distutils cython	34	USE_PYTHON= autoplist distutils cython
36		35
37	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
38		37
39	.if ${PYTHON_REL} < 30700	38	.if ${PYTHON_REL} < 30700
40	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}idna_ssl>=1.0:dns/py-idna_ssl@${PY_FLAVOR} \	39	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}idna_ssl>=1.0:dns/py-idna_ssl@${PY_FLAVOR}
41	${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.5:devel/py-typing-extensions@${PY_FLAVOR}
42	.endif	40	.endif
43		41
44	pre-configure:	42	pre-configure:

Removed Link Here

(-)a/www/py-aiohttp/files/patch-setup.py (-27 lines)
1	Obtained from: https://github.com/aio-libs/aiohttp/commit/d7db1b90c59ae49660d5b469f6186d088a6d190d
2
3	--- setup.py.orig 2019-10-09 16:52:31 UTC
4	+++ setup.py
5	@@ -74,7 +74,7 @@ except IndexError:
6	install_requires = [
7	'attrs>=17.3.0',
8	'chardet>=2.0,<4.0',
9	- 'multidict>=4.5,<5.0',
10	+ 'multidict>=4.5,<6.0',
11	'async_timeout>=3.0,<4.0',
12	'yarl>=1.0,<2.0',
13	'idna-ssl>=1.0; python_version<"3.7"',
14	@@ -104,9 +104,12 @@ NEEDS_PYTEST = {'pytest', 'test'}.intersection(sys.arg
15	pytest_runner = ['pytest-runner'] if NEEDS_PYTEST else []
16
17	tests_require = [
18	- 'pytest', 'gunicorn',
19	+ 'pytest>=3.8.2', 'gunicorn',
20	'pytest-timeout', 'async-generator',
21	'pytest-xdist',
22	+ 'pytest-mock',
23	+ 'trustme',
24	+ 'brotlipy',
25	]
26
27