Re: [UPDATE] www/py-webpy to 0.40

On Fri, Oct 04, 2019 at 01:35:12PM +0800, Kevin Lo wrote:

> Thank you for the review and your comments. Here's the revised diff.
> ok?

One tweak: Lose the MODPY_TEST_ARGS. pytest will find the tests directory
automatically.

Then, ok kmos@

> Index: www/py-webpy/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/py-webpy/Makefile,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 Makefile
> --- www/py-webpy/Makefile 12 Jul 2019 20:51:03 -0000 1.14
> +++ www/py-webpy/Makefile 4 Oct 2019 05:30:10 -0000
> @@ -2,26 +2,30 @@
>
> COMMENT= web framework for python
>
> -VERSION= 0.38
> -DISTNAME= web.py-${VERSION}
> -PKGNAME= py-webpy-${VERSION}
> +MODPY_EGG_VERSION= 0.40
> +DISTNAME= web.py-${MODPY_EGG_VERSION}
> +PKGNAME= py-webpy-${MODPY_EGG_VERSION}
> +
> CATEGORIES= www
>
> -MASTER_SITES= ${HOMEPAGE}/static/
> HOMEPAGE= http://webpy.org
>
> +MAINTAINER= Kevin Lo <kevlo@openbsd.org>
> +
> # Public Domain, except wsgiserver
> PERMIT_PACKAGE= Yes
>
> MODULES= lang/python
>
> -SUBST_VARS= VERSION
> +MODPY_PI= Yes
> +MODPY_PYTEST= Yes
> +MODPY_PYTEST_ARGS= tests
> +MODPY_SETUPTOOLS= Yes
>
> -TEST_DEPENDS= databases/py-sqlite2 \
> - ${BASE_PKGPATH}
> +RUN_DEPENDS= textproc/py-markdown${MODPY_FLAVOR} \
> + www/py-cheroot${MODPY_FLAVOR}
>
> -do-test:
> - cd ${WRKSRC} && ${MODPY_BIN} ./web/test.py
> - cd ${WRKSRC} && ${MODPY_BIN} ./web/db.py SqliteTest
> +FLAVORS= python3
> +FLAVOR ?=
>
> .include <bsd.port.mk>
> Index: www/py-webpy/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/py-webpy/distinfo,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 distinfo
> --- www/py-webpy/distinfo 3 Nov 2016 10:12:34 -0000 1.7
> +++ www/py-webpy/distinfo 4 Oct 2019 05:30:10 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (web.py-0.38.tar.gz) = CcYbW2tuHdVYgY0H37qzstoGI2AwecfXIjZEsofwiHA=
> -SIZE (web.py-0.38.tar.gz) = 91877
> +SHA256 (web.py-0.40.tar.gz) = 3F5C/7xC130H91t6zKmXWjNormCXdOSd3rtJenhBMfM=
> +SIZE (web.py-0.40.tar.gz) = 103781
> Index: www/py-webpy/pkg/DESCR
> ===================================================================
> RCS file: /cvs/ports/www/py-webpy/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 DESCR
> --- www/py-webpy/pkg/DESCR 5 Dec 2007 15:44:49 -0000 1.1.1.1
> +++ www/py-webpy/pkg/DESCR 4 Oct 2019 05:30:10 -0000
> @@ -1,3 +1,3 @@
> web.py is a web framework for python that is as simple as it is
> powerful. web.py is in the public domain; you can use it for whatever
> -purpose with absolutely no restrictions.
> +purpose with absolutely no restrictions.
> Index: www/py-webpy/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/py-webpy/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 PLIST
> --- www/py-webpy/pkg/PLIST 20 Jan 2013 09:10:04 -0000 1.6
> +++ www/py-webpy/pkg/PLIST 4 Oct 2019 05:30:10 -0000
> @@ -1,49 +1,47 @@
> @comment $OpenBSD: PLIST,v 1.6 2013/01/20 09:10:04 benoit Exp $
> lib/python${MODPY_VERSION}/site-packages/web/
> -lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${VERSION}-py${MODPY_VERSION}.egg-info
> +lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> +lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> +lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> +lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
> +lib/python${MODPY_VERSION}/site-packages/web.${MODPY_PY_PREFIX}${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/web/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/web/__init__.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/application.py
> -lib/python${MODPY_VERSION}/site-packages/web/application.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/browser.py
> -lib/python${MODPY_VERSION}/site-packages/web/browser.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}browser.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/contrib/
> lib/python${MODPY_VERSION}/site-packages/web/contrib/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/web/contrib/__init__.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/web/contrib/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/web/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/contrib/template.py
> -lib/python${MODPY_VERSION}/site-packages/web/contrib/template.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/contrib/${MODPY_PYCACHE}template.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/db.py
> -lib/python${MODPY_VERSION}/site-packages/web/db.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}db.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/debugerror.py
> -lib/python${MODPY_VERSION}/site-packages/web/debugerror.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}debugerror.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/form.py
> -lib/python${MODPY_VERSION}/site-packages/web/form.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}form.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/http.py
> -lib/python${MODPY_VERSION}/site-packages/web/http.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/httpserver.py
> -lib/python${MODPY_VERSION}/site-packages/web/httpserver.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}httpserver.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/net.py
> -lib/python${MODPY_VERSION}/site-packages/web/net.pyc
> -lib/python${MODPY_VERSION}/site-packages/web/python23.py
> -lib/python${MODPY_VERSION}/site-packages/web/python23.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}net.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/web/py3helpers.py
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}py3helpers.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/session.py
> -lib/python${MODPY_VERSION}/site-packages/web/session.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/template.py
> -lib/python${MODPY_VERSION}/site-packages/web/template.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}template.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/test.py
> -lib/python${MODPY_VERSION}/site-packages/web/test.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/utils.py
> -lib/python${MODPY_VERSION}/site-packages/web/utils.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/webapi.py
> -lib/python${MODPY_VERSION}/site-packages/web/webapi.pyc
> -lib/python${MODPY_VERSION}/site-packages/web/webopenid.py
> -lib/python${MODPY_VERSION}/site-packages/web/webopenid.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}webapi.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/web/wsgi.py
> -lib/python${MODPY_VERSION}/site-packages/web/wsgi.pyc
> -lib/python${MODPY_VERSION}/site-packages/web/wsgiserver/
> -lib/python${MODPY_VERSION}/site-packages/web/wsgiserver/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/web/wsgiserver/__init__.pyc
> -lib/python${MODPY_VERSION}/site-packages/web/wsgiserver/ssl_builtin.py
> -lib/python${MODPY_VERSION}/site-packages/web/wsgiserver/ssl_builtin.pyc
> -lib/python${MODPY_VERSION}/site-packages/web/wsgiserver/ssl_pyopenssl.py
> -lib/python${MODPY_VERSION}/site-packages/web/wsgiserver/ssl_pyopenssl.pyc
> +lib/python${MODPY_VERSION}/site-packages/web/${MODPY_PYCACHE}wsgi.${MODPY_PYC_MAGIC_TAG}pyc