On Fri, Aug 14, 2020 at 07:41:09PM +0200, Bjorn Ketelaars wrote:
>
> On Fri 14/08/2020 23:11, Kevin Lo 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}
>
> ^^^
>
> I would prefer to use FLAVORS/FLAVOR as it seems that py-webpy is not a
> standalone python tool. Note that this also requires a different change
> to www/Makefile, @@conflict- and @pkgpath-markers in pkg/PLIST, and a
> quirk:
Thanks for your quick assistance. You've made all necessary changes!
ok to commit your diff? Thank you.
> diff --git devel/quirks/Makefile devel/quirks/Makefile
> index 310690b339e..ddb9f081af4 100644
> --- devel/quirks/Makefile
> +++ devel/quirks/Makefile
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-3.402
> +PKGNAME = quirks-3.403
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
> diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
> index 0281c4ac939..e1a7e457c0a 100644
> --- devel/quirks/files/Quirks.pm
> +++ devel/quirks/files/Quirks.pm
> @@ -459,6 +459,7 @@ my $stem_extensions = {
> 'py-ecos' => 'py3-ecos',
> 'py-numexpr' => 'py3-numexpr',
> 'py-notmuch' => 'py3-notmuch',
> + 'py-webpy' => 'py3-webpy',
> };
>
> my $obsolete_reason = {
> diff --git www/Makefile www/Makefile
> index 775663595f6..538199c2f9b 100644
> --- www/Makefile
> +++ www/Makefile
> @@ -510,7 +510,6 @@
> SUBDIR += py-webhelpers
> SUBDIR += py-webob
> SUBDIR += py-webob,python3
> - SUBDIR += py-webpy
> SUBDIR += py-webpy,python3
> SUBDIR += py-webtest
> SUBDIR += py-webtest,python3
> diff --git www/py-webpy/Makefile www/py-webpy/Makefile
> index a7ce4677e2a..fd48f19727f 100644
> --- 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
>
> @@ -22,10 +21,9 @@ MODPY_PI= Yes
> MODPY_PYTEST= Yes
> MODPY_SETUPTOOLS= Yes
>
> -RUN_DEPENDS= textproc/py-markdown${MODPY_FLAVOR} \
> - www/py-cheroot${MODPY_FLAVOR}
> +RUN_DEPENDS= www/py-cheroot${MODPY_FLAVOR}
>
> FLAVORS= python3
> -FLAVOR ?=
> +FLAVOR= python3
>
> .include <bsd.port.mk>
> diff --git www/py-webpy/distinfo www/py-webpy/distinfo
> index aef5d002c0e..a9e764d69d7 100644
> --- 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
> diff --git www/py-webpy/patches/patch-tests_test_wsgi_py
> www/py-webpy/patches/patch-tests_test_wsgi_py
> deleted file mode 100644
> index 996b5bce82d..00000000000
> --- www/py-webpy/patches/patch-tests_test_wsgi_py
> +++ /dev/null
> @@ -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()
> diff --git www/py-webpy/pkg/PLIST www/py-webpy/pkg/PLIST
> index fb6825db637..b0e96b2535e 100644
> --- www/py-webpy/pkg/PLIST
> +++ www/py-webpy/pkg/PLIST
> @@ -1,4 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.8 2019/10/05 16:20:37 kmos Exp $
> +@conflict py-webpy-*
> +@pkgpath www/py-webpy-*
> lib/python${MODPY_VERSION}/site-packages/web/
>
> lib/python${MODPY_VERSION}/site-packages/web.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/web.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>
