On Wed, Jan 17, 2018 at 09:27:32PM +0100, Joerg Jung wrote:
> On Wed, Jan 17, 2018 at 12:13:14AM +0100, Joerg Jung wrote:
> > Hi,
> > 
> > please find attached an update for www/py-aiohttp.
> > This update depends on earlier send updates (py-multidict) and new ports
> > (py-yarl) and is needed as a dependency for the upcoming homeassistant
> > port.
> > 
> > Unfortunately, a few tests are failing, but I have no idea why or how to
> > fix them, any hints are welcome.
> 
> Meanwhile 2.3.9 was released. New diff below. Still few tests failing.
Changes between 2.3.7 and 2.3.9 seem unproblematic to me but I cannot
properly test the homeassistant port (for now):

* Do not use yarl.unquote internal function in aiohttp. Fix incorrectly
  unquoted path part in URL dispatcher (#2662)
* Fix compatibility with yarl==1.0.0 (#2662)
* Fix colon handing in path for dynamic resources (#2670)

Updated diff using the correct homepage, doing s,http,HTTP, as done on
their site and adding minimal version requirements.

Some tests fail, full test.log attached.

        4 failed, 1912 passed, 36 skipped, 5 xfailed, 78 error in 74.05 seconds

diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile
index 0cc78407356..98b60594f4c 100644
--- a/www/py-aiohttp/Makefile
+++ b/www/py-aiohttp/Makefile
@@ -2,27 +2,28 @@
 
 COMMENT =              http client/server for asyncio
 
-MODPY_EGG_VERSION =    0.22.5
+MODPY_EGG_VERSION =    2.3.9
 DISTNAME =             aiohttp-${MODPY_EGG_VERSION}
 PKGNAME =              py-${DISTNAME}
 CATEGORIES =           www
-REVISION =             0
+
+HOMEPAGE =             https://docs.aiohttp.org
 
 # Apache2
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += ${MODPY_WANTLIB} pthread
+WANTLIB +=             ${MODPY_WANTLIB} pthread
 
 MODULES =              lang/python
 
 MODPY_PI =             Yes
 MODPY_SETUPTOOLS =     Yes
-
 MODPY_VERSION =                ${MODPY_DEFAULT_VERSION_3}
 
-# py-multidict is python3 only
-RUN_DEPENDS =          textproc/py-chardet${MODPY_FLAVOR} \
-                       www/py-multidict
+RUN_DEPENDS =          devel/py-async-timeout>=1.2.0 \
+                       textproc/py-chardet${MODPY_FLAVOR} \
+                       www/py-multidict>=4.0 \
+                       www/py-yarl>=1.0.0
 TEST_DEPENDS =         ${RUN_DEPENDS} \
                        devel/py-test${MODPY_FLAVOR} \
                        www/py-gunicorn${MODPY_FLAVOR}
diff --git a/www/py-aiohttp/distinfo b/www/py-aiohttp/distinfo
index 7083bc12244..cc43e438ec3 100644
--- a/www/py-aiohttp/distinfo
+++ b/www/py-aiohttp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aiohttp-0.22.5.tar.gz) = nFGvAwyGb5HhiiGWFOOdNF20SD7ZhgOJ0FNtdNBLDTs=
-SIZE (aiohttp-0.22.5.tar.gz) = 475312
+SHA256 (aiohttp-2.3.9.tar.gz) = YAO+143FkdMb2J7xbmMKHE/ZejzRe5deyUXA9G1vyIE=
+SIZE (aiohttp-2.3.9.tar.gz) = 847835
diff --git a/www/py-aiohttp/pkg/PLIST b/www/py-aiohttp/pkg/PLIST
index 64d5a28d7ab..b81f752ba3c 100644
--- a/www/py-aiohttp/pkg/PLIST
+++ b/www/py-aiohttp/pkg/PLIST
@@ -11,59 +11,90 @@ lib/python${MODPY_VERSION}/site-packages/aiohttp/__init__.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}backport_cookies.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_proto.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_reqrep.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_ws.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}connector.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}file_sender.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}cookiejar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}formdata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}frozenlist.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}hdrs.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http_websocket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http_writer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}locks.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}multipart.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}parsers.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}payload.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}payload_streamer.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}pytest_plugin.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}streams.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_reqrep.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_fileresponse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_middlewares.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_protocol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_request.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_response.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_server.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_urldispatcher.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_ws.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}websocket_client.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}wsgi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/_cparser.pxd
+lib/python${MODPY_VERSION}/site-packages/aiohttp/_frozenlist.c
+lib/python${MODPY_VERSION}/site-packages/aiohttp/_frozenlist.pyx
+lib/python${MODPY_VERSION}/site-packages/aiohttp/_frozenlist.so
+lib/python${MODPY_VERSION}/site-packages/aiohttp/_http_parser.c
+lib/python${MODPY_VERSION}/site-packages/aiohttp/_http_parser.pyx
+lib/python${MODPY_VERSION}/site-packages/aiohttp/_http_parser.so
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_websocket.c
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_websocket.pyx
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_websocket.so
 lib/python${MODPY_VERSION}/site-packages/aiohttp/abc.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/backport_cookies.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/client.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/client_exceptions.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/client_proto.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/client_reqrep.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/client_ws.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/connector.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/errors.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/file_sender.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/cookiejar.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/formdata.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/frozenlist.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/hdrs.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/helpers.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/http.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/http_exceptions.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/http_parser.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/http_websocket.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/http_writer.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/locks.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/log.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/multipart.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/parsers.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/protocol.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/payload.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/payload_streamer.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/pytest_plugin.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/resolver.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/server.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/signals.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/streams.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/test_utils.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/web.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/web_exceptions.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/web_reqrep.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/web_fileresponse.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/web_middlewares.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/web_protocol.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/web_request.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/web_response.py
+lib/python${MODPY_VERSION}/site-packages/aiohttp/web_server.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/web_urldispatcher.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/web_ws.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/websocket.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/websocket_client.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/worker.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/wsgi.py

Attachment: test.log.gz
Description: Binary data

Reply via email to