On 2020/06/26 11:48, Aisha Tammy wrote:
> On 6/26/20 11:30 AM, Antoine Jacoutot wrote:
> > On Fri, Jun 26, 2020 at 10:04:22AM -0400, Aisha Tammy wrote:
> >> On 6/26/20 9:58 AM, Antoine Jacoutot wrote:
> >>> On Fri, Jun 26, 2020 at 08:08:24AM -0400, Aisha Tammy wrote:
> >>>> I've updated the port py-flask-principal to use
> >>>> only python3.
> >>>> There are no reverse dependencies so this should
> >>>> not be breaking anything.
> >>>
> >>> You need to use the FLAVOR/FLAVORS combo, not MODPY_DEFAULT_VERSION_3.
> >>>
> >>
> >> I thought as python2 is EOL and there are no reverse dependencies
> >> it might be better to drop python 2 support, for any eventual cleanup?
> > 
> > You enforce the python3 FLAVOR like this:
> > 
> > FLAVORS=    python3
> > FLAVOR=             python3
> > 
> 
> Ah, thanks for that.
> I only recently learnt that the MODPY_DEFAULT_VERSION_3 is not the
> recommended method.

For standalone packages (e.g. a program which happens to use Python),
use MODPY_DEFAULT_VERSION_3.

For Python modules, use FLAVOR/FLAVORS, then if any ports depend on them
they can use e.g. "www/py-flask-principal${MODPY_FLAVOR}" rather than
a mess of "www/py-foo" and "www/py-bar${MODPY_FLAVOR}"..

There are still some Python modules in the tree using the
MODPY_DEFAULT_VERSION_3 method because we haven't swept the tree to
remove them yet.

> Have attached new diff as seems like my thunderbird likes to mess up.
> 
> Aisha
> 

> diff --git www/py-flask-principal/Makefile www/py-flask-principal/Makefile
> index d062e04f581..b3d80ecffd8 100644
> --- www/py-flask-principal/Makefile
> +++ www/py-flask-principal/Makefile
> @@ -3,7 +3,7 @@
>  COMMENT =            identity management for flask
>  
>  MODPY_EGG_VERSION =  0.4.0
> -REVISION =           1
> +REVISION =           2
>  DISTNAME =           Flask-Principal-${MODPY_EGG_VERSION}
>  PKGNAME =            py-${DISTNAME:L}
>  
> @@ -16,11 +16,14 @@ MAINTAINER =              Aaron Bieber 
> <abie...@openbsd.org>
>  # MIT
>  PERMIT_PACKAGE =     Yes
>  
> +FLAVORS =    python3
> +FLAVOR =     python3
> +
>  MODPY_PI =           Yes
>  
>  MODULES =            lang/python
>  
> -RUN_DEPENDS +=               www/py-flask
> +RUN_DEPENDS +=               www/py-flask${MODPY_FLAVOR}
>  
>  MODPY_SETUPTOOLS =   Yes
>  
> diff --git www/py-flask-principal/pkg/PLIST www/py-flask-principal/pkg/PLIST
> index a7db0b09fcb..4193651f7f9 100644
> --- www/py-flask-principal/pkg/PLIST
> +++ www/py-flask-principal/pkg/PLIST
> @@ -6,5 +6,5 @@ 
> lib/python${MODPY_VERSION}/site-packages/Flask_Principal-${MODPY_EGG_VERSION}-py
>  
> lib/python${MODPY_VERSION}/site-packages/Flask_Principal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
>  
> lib/python${MODPY_VERSION}/site-packages/Flask_Principal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
>  
> lib/python${MODPY_VERSION}/site-packages/Flask_Principal-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}flask_principal.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/flask_principal.py
> -lib/python${MODPY_VERSION}/site-packages/flask_principal.pyc

Reply via email to