Thank you for your input. I couldn't figure out why FLAVORS/FLAVOR should be used, but bket@ gave me a reason. I always learn so much from porters :)
On Fri, Aug 14, 2020 at 06:38:23PM +0100, Stuart Henderson wrote: > Please remove MODPY_VERSION, use > > FLAVORS=python3 > FLAVOR=python3 > > in Makefile, @pkgpath www/py-webpy in pkg/PLIST, keep the ,python3 in > ../Makefile and add a py-webpy -> py3-webpy entry to devel/quirks (see > commits for recent py2->3 conversions). > > -- > Sent from a phone, apologies for poor formatting. > On 14 August 2020 16:11:35 Kevin Lo <[email protected]> wrote: > > > Hi ports@, > > > > Here's an update of py-webpy to 0.61; tested on amd64. > > Changelog here: https://github.com/webpy/webpy/blob/master/ChangeLog.txt#L3 > > > > Ok? > > > > diff 97d8ad9fab2eb4471daa9889eccb062257734419 /usr/ports > > blob - 775663595f625596e030122a20f619d5b0215a11 > > file + www/Makefile > > --- www/Makefile > > +++ www/Makefile > > @@ -511,7 +511,6 @@ > > SUBDIR += py-webob > > SUBDIR += py-webob,python3 > > SUBDIR += py-webpy > > - SUBDIR += py-webpy,python3 > > SUBDIR += py-webtest > > SUBDIR += py-webtest,python3 > > SUBDIR += py-werkzeug > > blob - a7ce4677e2aecb89976b05a7d24fd3f623579c30 > > file + www/py-webpy/Makefile > > --- www/py-webpy/Makefile > > +++ www/py-webpy/Makefile > > @@ -2,10 +2,9 @@ > > > > COMMENT= web framework for python > > > > -MODPY_EGG_VERSION= 0.40 > > +MODPY_EGG_VERSION= 0.61 > > DISTNAME= web.py-${MODPY_EGG_VERSION} > > PKGNAME= py-webpy-${MODPY_EGG_VERSION} > > -REVISION= 1 > > > > CATEGORIES= www > > > > @@ -21,11 +20,9 @@ MODULES= lang/python > > MODPY_PI= Yes > > MODPY_PYTEST= Yes > > MODPY_SETUPTOOLS= Yes > > +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3} > > > > -RUN_DEPENDS= textproc/py-markdown${MODPY_FLAVOR} \ > > - www/py-cheroot${MODPY_FLAVOR} > > > > -FLAVORS= python3 > > -FLAVOR ?= > > +RUN_DEPENDS= www/py-cheroot${MODPY_FLAVOR} > > > > .include <bsd.port.mk> > > blob - aef5d002c0e971963a5a92f9dd563821789f1e04 > > file + www/py-webpy/distinfo > > --- www/py-webpy/distinfo > > +++ www/py-webpy/distinfo > > @@ -1,2 +1,2 @@ > > -SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM= > > -SIZE (web.py-0.40.tar.gz) = 103781 > > +SHA256 (web.py-0.61.tar.gz) = x6kIGusIbNPnA8dVOkfudRiNHTJfJe7HZU2bsAtezLs= > > +SIZE (web.py-0.61.tar.gz) = 623070 > > blob - 996b5bce82d3634d3215db8b82a614db4284b160 > > file + /dev/null > > --- www/py-webpy/patches/patch-tests_test_wsgi_py > > +++ www/py-webpy/patches/patch-tests_test_wsgi_py > > @@ -1,56 +0,0 @@ > > -$OpenBSD: patch-tests_test_wsgi_py,v 1.1 2019/10/04 15:06:31 kevlo Exp $ > > - > > -- Fix unit tests in tests/test_wsgi.py > > - upstream commit a345caedd53ea690b8804d461ae4d941b3a849b4 > > - > > -Index: tests/test_wsgi.py > > ---- tests/test_wsgi.py.orig > > -+++ tests/test_wsgi.py > > -@@ -1,9 +1,15 @@ > > - import unittest > > --import web > > - import threading > > - import time > > - > > -+try: # PY 3 > > -+ from urllib.parse import unquote_to_bytes as unquote > > -+except ImportError: # PY 2 > > -+ from urllib import unquote > > - > > -+import web > > -+ > > -+ > > - class WSGITest(unittest.TestCase): > > - def test_layers_unicode(self): > > - urls = ("/", "uni") > > -@@ -18,7 +24,7 @@ class WSGITest(unittest.TestCase): > > - thread.start() > > - time.sleep(0.5) > > - > > -- b = web.browser.Browser() > > -+ b = web.browser.AppBrowser(app) > > - r = b.open("/").read() > > - s = r.decode("utf8") > > - self.assertEqual(s, u"\u0C05\u0C06") > > -@@ -39,7 +45,7 @@ class WSGITest(unittest.TestCase): > > - thread.start() > > - time.sleep(0.5) > > - > > -- b = web.browser.Browser() > > -+ b = web.browser.AppBrowser(app) > > - r = b.open("/") > > - self.assertEqual(r.read(), b"abcdef") > > - > > -@@ -59,9 +65,10 @@ class WSGITest(unittest.TestCase): > > - thread.start() > > - time.sleep(0.5) > > - > > -- b = web.browser.Browser() > > -+ b = web.browser.AppBrowser(app) > > - r = b.open("/%E2%84%A6") > > -- self.assertEqual(r.read(), b"\xE2\x84\xA6") > > -+ s = unquote(r.read()) > > -+ self.assertEqual(s, b"\xE2\x84\xA6") > > - > > - app.stop() > > - thread.join() >
