Below diff updates py-tornado to the latest version which is now python3-only.
This update is needed so jupyter-notebook can be updated to the latest version. ok? Index: www/Makefile =================================================================== RCS file: /cvs/ports/www/Makefile,v retrieving revision 1.992 diff -u -p -u -r1.992 Makefile --- www/Makefile 30 Dec 2020 15:02:41 -0000 1.992 +++ www/Makefile 18 Jan 2021 07:41:33 -0000 @@ -508,7 +508,6 @@ SUBDIR += py-tempita SUBDIR += py-tempita,python3 SUBDIR += py-terminado,python3 - SUBDIR += py-tornado SUBDIR += py-tornado,python3 SUBDIR += py-treq,python3 SUBDIR += py-uritemplate Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.1125 diff -u -p -u -r1.1125 Makefile --- devel/quirks/Makefile 18 Jan 2021 06:43:19 -0000 1.1125 +++ devel/quirks/Makefile 18 Jan 2021 07:41:33 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.513 +PKGNAME = quirks-3.514 PKG_ARCH = * MAINTAINER = Marc Espie <es...@openbsd.org> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1141 diff -u -p -u -r1.1141 Quirks.pm --- devel/quirks/files/Quirks.pm 18 Jan 2021 06:43:19 -0000 1.1141 +++ devel/quirks/files/Quirks.pm 18 Jan 2021 07:41:33 -0000 @@ -533,6 +533,7 @@ my $stem_extensions = { 'py-commonmark' => 'py3-commonmark', 'py-recommonmark' => 'py3-recommonmark', 'py-sphinx_guzzle_theme' => 'py3-sphinx_guzzle_theme', + 'py-tornado' => 'py3-tornado', }; my $obsolete_reason = { Index: www/py-tornado/Makefile =================================================================== RCS file: /cvs/ports/www/py-tornado/Makefile,v retrieving revision 1.25 diff -u -p -u -r1.25 Makefile --- www/py-tornado/Makefile 4 Jan 2021 14:06:39 -0000 1.25 +++ www/py-tornado/Makefile 18 Jan 2021 07:41:33 -0000 @@ -2,11 +2,9 @@ COMMENT = scalable, non-blocking web server -# 5.x is the last major release which support both py2+3, 6.x is py3-only -MODPY_EGG_VERSION = 5.1.1 +MODPY_EGG_VERSION = 6.1 DISTNAME = tornado-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 3 CATEGORIES = www @@ -15,25 +13,19 @@ HOMEPAGE = https://www.tornadoweb.org/ # Apache v2 PERMIT_PACKAGE = Yes +WANTLIB += pthread ${MODPY_WANTLIB} + MODULES = lang/python -TEST_DEPENDS = net/py-curl${MODPY_FLAVOR} -WANTLIB += pthread ${MODPY_WANTLIB} +FLAVORS = python3 +FLAVOR = python3 MODPY_PI = Yes MODPY_SETUPTOOLS = Yes -FLAVORS = python3 -FLAVOR ?= - -.if !${FLAVOR:Mpython3} -RUN_DEPENDS += devel/py-backports-abc \ - devel/py-certifi \ - devel/py-futures \ - devel/py-singledispatch -TEST_DEPENDS += devel/py-mock \ - devel/py-twisted -.endif +TEST_DEPENDS = devel/py-twisted${MODPY_FLAVOR} \ + net/py-cares${MODPY_FLAVOR} \ + net/py-curl${MODPY_FLAVOR} pre-test: ${MODPY_CMD} build_ext --inplace Index: www/py-tornado/distinfo =================================================================== RCS file: /cvs/ports/www/py-tornado/distinfo,v retrieving revision 1.12 diff -u -p -u -r1.12 distinfo --- www/py-tornado/distinfo 27 Apr 2019 14:32:21 -0000 1.12 +++ www/py-tornado/distinfo 18 Jan 2021 07:41:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (tornado-5.1.1.tar.gz) = TlFY2XWDUCp+JzmVFVPL2IpyB28VK0sRtkuaEMTElAk= -SIZE (tornado-5.1.1.tar.gz) = 516819 +SHA256 (tornado-6.1.tar.gz) = M8boHXvVW0aNLnk1F8kJsTmWC2x5CmC3mRuba3b7l5E= +SIZE (tornado-6.1.tar.gz) = 497359 Index: www/py-tornado/pkg/PFRAG.no-python3 =================================================================== RCS file: www/py-tornado/pkg/PFRAG.no-python3 diff -N www/py-tornado/pkg/PFRAG.no-python3 --- www/py-tornado/pkg/PFRAG.no-python3 3 Jan 2017 18:58:52 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.no-python3,v 1.1 2017/01/03 18:58:52 shadchin Exp $ -lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt Index: www/py-tornado/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/py-tornado/pkg/PLIST,v retrieving revision 1.11 diff -u -p -u -r1.11 PLIST --- www/py-tornado/pkg/PLIST 4 Jan 2021 14:06:39 -0000 1.11 +++ www/py-tornado/pkg/PLIST 18 Jan 2021 07:41:33 -0000 @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.11 2021/01/04 14:06:39 sthen Exp $ -!%%python3%% +@conflict py-tornado-* +@pkgpath www/py-tornado lib/python${MODPY_VERSION}/site-packages/tornado/ lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/tornado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO @@ -31,7 +32,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}queues.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}routing.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}simple_httpclient.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}stack_context.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}tcpclient.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}tcpserver.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/${MODPY_PYCACHE}template.${MODPY_PYC_MAGIC_TAG}pyc @@ -63,41 +63,23 @@ lib/python${MODPY_VERSION}/site-packages ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}asyncio.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}auto.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}caresresolver.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}epoll.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}kqueue.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}posix.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}select.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}twisted.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/platform/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/platform/asyncio.py -lib/python${MODPY_VERSION}/site-packages/tornado/platform/auto.py lib/python${MODPY_VERSION}/site-packages/tornado/platform/caresresolver.py -lib/python${MODPY_VERSION}/site-packages/tornado/platform/common.py -lib/python${MODPY_VERSION}/site-packages/tornado/platform/epoll.py -lib/python${MODPY_VERSION}/site-packages/tornado/platform/interface.py -lib/python${MODPY_VERSION}/site-packages/tornado/platform/kqueue.py -lib/python${MODPY_VERSION}/site-packages/tornado/platform/posix.py -lib/python${MODPY_VERSION}/site-packages/tornado/platform/select.py lib/python${MODPY_VERSION}/site-packages/tornado/platform/twisted.py -lib/python${MODPY_VERSION}/site-packages/tornado/platform/windows.py lib/python${MODPY_VERSION}/site-packages/tornado/process.py +lib/python${MODPY_VERSION}/site-packages/tornado/py.typed lib/python${MODPY_VERSION}/site-packages/tornado/queues.py lib/python${MODPY_VERSION}/site-packages/tornado/routing.py lib/python${MODPY_VERSION}/site-packages/tornado/simple_httpclient.py @so lib/python${MODPY_VERSION}/site-packages/tornado/speedups.${MODPY_PYC_MAGIC_TAG}so -lib/python${MODPY_VERSION}/site-packages/tornado/stack_context.py lib/python${MODPY_VERSION}/site-packages/tornado/tcpclient.py lib/python${MODPY_VERSION}/site-packages/tornado/tcpserver.py lib/python${MODPY_VERSION}/site-packages/tornado/template.py lib/python${MODPY_VERSION}/site-packages/tornado/test/ -lib/python${MODPY_VERSION}/site-packages/tornado/test/__init__.py lib/python${MODPY_VERSION}/site-packages/tornado/test/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}/ -lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}asyncio_test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}auth_test.${MODPY_PYC_MAGIC_TAG}pyc @@ -124,7 +106,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}routing_test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}runtests.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}simple_httpclient_test.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}stack_context_test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}tcpclient_test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}tcpserver_test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}template_test.${MODPY_PYC_MAGIC_TAG}pyc @@ -134,7 +115,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}util_test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}web_test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}websocket_test.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}windows_test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/${MODPY_PYCACHE}wsgi_test.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/tornado/test/asyncio_test.py lib/python${MODPY_VERSION}/site-packages/tornado/test/auth_test.py @@ -171,7 +151,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/tornado/test/routing_test.py lib/python${MODPY_VERSION}/site-packages/tornado/test/runtests.py lib/python${MODPY_VERSION}/site-packages/tornado/test/simple_httpclient_test.py -lib/python${MODPY_VERSION}/site-packages/tornado/test/stack_context_test.py lib/python${MODPY_VERSION}/site-packages/tornado/test/static/ lib/python${MODPY_VERSION}/site-packages/tornado/test/static/dir/ lib/python${MODPY_VERSION}/site-packages/tornado/test/static/dir/index.html @@ -193,7 +172,6 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/tornado/test/util_test.py lib/python${MODPY_VERSION}/site-packages/tornado/test/web_test.py lib/python${MODPY_VERSION}/site-packages/tornado/test/websocket_test.py -lib/python${MODPY_VERSION}/site-packages/tornado/test/windows_test.py lib/python${MODPY_VERSION}/site-packages/tornado/test/wsgi_test.py lib/python${MODPY_VERSION}/site-packages/tornado/testing.py lib/python${MODPY_VERSION}/site-packages/tornado/util.py