On Mon, Jan 13, 2020 at 04:18:07PM +0100, clematis wrote: > On Mon, Jan 06, 2020 at 12:55:47PM +0000, Stuart Henderson wrote: > > On 2020/01/06 09:42, clematis wrote: > > > On Thu, Nov 28, 2019 at 08:13:04AM +0100, clematis wrote: > > > > On Wed, Nov 27, 2019 at 09:18:45PM +0000, Stuart Henderson wrote: > > > > > diff -u, please. > > > > > > > > > > > > > Please find diff -u attached. > > > > Cheers, > > > > > > ping? > > > Diff: https://marc.info/?l=openbsd-ports&m=157492525529846&q=p3 > > > > > Committed with tweaks: > > > > - remove REVISION line > > - remove bogus dep on python--tests > > - use MODPY_PYTEST > > Previous submission was breaking py2 flavor.(sorry about that). > py2 doesn't support async stuff, so _async_kw_event_loop.py would throw > an error when byte-compiling. > I had a quick chat with one of the urwid maintainer but I didn't feel like > they had much interest in fixing this. I've opened a github issue for > the record and to track this. [1] > > In the meantime, I don't know if there's a prefered way to fix this in > between removing _async_kw_event_loop.py post-extract or using > MODPY_COMMENT. I found both method being used (devel/py-freezegun and > devel/py-pexpect). I felt more confortable not touching PLIST so I went > for the first approach. > > both flavors build, package, install, deinstall ok on amd64. tests > haven't changed. RUN_DEPENDS OK. > > New diff attached. > Feedback, comments are welcome. > > Thanks, > > [1] https://github.com/urwid/urwid/issues/393
Hi team, That won't be fixed upstream as they have no more interest in py2. Are we keeping the FLAVOR and moving forward with this diff using post-extract to remove the _async* breaking py2? Or should I make it a py3 only port and also ${MODPY_DEFAULT_VERSION_3} the run_depends: /usr/ports/devel/bpython /usr/ports/devel/bpython,python3 /usr/ports/devel/pudb /usr/ports/devel/pudb,python3 Two other run_depends are already default to py3: /usr/ports/net/toot /usr/ports/productivity/khal And this last one, well, it was declared dead [1] in 2017 so we might just remove it if no-one has any objection. /usr/ports/productivity/py-carddav [1] http://lostpackets.de/pycarddav/pycarddav-is-dead.html Any prefered way to proceed? Thanks. -- clematis (0x7e96fd2400fe7b59)
Index: Makefile =================================================================== RCS file: /cvs/ports/devel/py-urwid/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- Makefile 7 Jan 2020 12:09:00 -0000 1.29 +++ Makefile 13 Jan 2020 14:46:51 -0000 @@ -2,11 +2,10 @@ COMMENT = console user interface library for python -MODPY_EGG_VERSION = 2.0.1 +MODPY_EGG_VERSION = 2.1.0 DISTNAME = urwid-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} CATEGORIES = devel -EPOCH = 0 HOMEPAGE = http://urwid.org/ @@ -15,18 +14,27 @@ MAINTAINER = Clem Atis <clematis@insiber # LGPLv2.1 PERMIT_PACKAGE = Yes -WANTLIB += pthread ${MODPY_WANTLIB} +WANTLIB += pthread ${MODPY_WANTLIB} TEST_DEPENDS = devel/py-gobject3${MODPY_FLAVOR} MODULES = lang/python -MODPY_SETUPTOOLS = Yes +MODPY_SETUPTOOLS = Yes MODPY_PI = Yes MODPY_PYTEST = Yes -MODPY_PYTEST_ARGS = urwid/tests +MODPY_PYTEST_ARGS = urwid/tests FLAVORS = python3 FLAVOR ?= + +# py2: _async_kw_event_loop.py doesn't compile on py2 but it's anyway +# py3 only. Removing the culprit post-extract until fixed upstream. +# (https://github.com/urwid/urwid/issues/393) + +.if !${FLAVOR:Mpython3} +post-extract: + rm ${WRKSRC}/urwid/_async_kw_event_loop.py +.endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/py-urwid/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 7 Jan 2020 12:09:00 -0000 1.10 +++ distinfo 13 Jan 2020 14:46:51 -0000 @@ -1,2 +1,2 @@ -SHA256 (urwid-2.0.1.tar.gz) = ZE0+OQCGcWGi/JKHqXYnU9Zr0ZR1Rnmtsmrt5Vm8zLw= -SIZE (urwid-2.0.1.tar.gz) = 604167 +SHA256 (urwid-2.1.0.tar.gz) = CJbzYGC+tr84ActVQwP+8zanlmFAF5dVG6EG0jq0zYY= +SIZE (urwid-2.1.0.tar.gz) = 630226 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/py-urwid/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 7 Jan 2020 12:09:00 -0000 1.7 +++ pkg/PLIST 13 Jan 2020 14:46:51 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2020/01/07 12:09:00 sthen Exp $ +@comment $OpenBSD: PLIST,v$ lib/python${MODPY_VERSION}/site-packages/urwid/ lib/python${MODPY_VERSION}/site-packages/urwid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/urwid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO @@ -9,6 +9,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/urwid/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}_async_kw_event_loop.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}canvas.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}command_map.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc @@ -24,6 +25,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}listbox.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}main_loop.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}monitored_list.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}numedit.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}old_str_util.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}raw_display.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc @@ -36,6 +38,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}web_display.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}widget.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/${MODPY_PYCACHE}wimp.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/urwid/_async_kw_event_loop.py lib/python${MODPY_VERSION}/site-packages/urwid/canvas.py lib/python${MODPY_VERSION}/site-packages/urwid/command_map.py lib/python${MODPY_VERSION}/site-packages/urwid/compat.py @@ -51,6 +54,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/urwid/listbox.py lib/python${MODPY_VERSION}/site-packages/urwid/main_loop.py lib/python${MODPY_VERSION}/site-packages/urwid/monitored_list.py +lib/python${MODPY_VERSION}/site-packages/urwid/numedit.py lib/python${MODPY_VERSION}/site-packages/urwid/old_str_util.py lib/python${MODPY_VERSION}/site-packages/urwid/raw_display.py lib/python${MODPY_VERSION}/site-packages/urwid/signals.py @@ -64,6 +68,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_container.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_decoration.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_doctests.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_escapes.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_event_loops.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_graphics.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/urwid/tests/${MODPY_PYCACHE}test_listbox.${MODPY_PYC_MAGIC_TAG}pyc @@ -77,6 +82,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_container.py lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_decoration.py lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_doctests.py +lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_escapes.py lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_event_loops.py lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_graphics.py lib/python${MODPY_VERSION}/site-packages/urwid/tests/test_listbox.py