On Sat, Jan 30, 2021 at 12:22:45PM +0100, Klemens Nanni wrote: > On Sat, Jan 30, 2021 at 08:19:29AM +0000, Dimitri Karamazov wrote: > > The qutebrowser-2.0.0 needs py-importlib-resources backport > > for python3.8 and lower. One of its dependencies is > > setuptools_scm[toml]>3.4.1 so I need to turn on python2 > > flavor for py-toml to update it. > I'd very much prefer if we'd work towards making qutebrowser and > dependencies py3 only. > > Otherwise it's a step backwards. > py2 is not required for qutebrowser. Adding py-toml(only py3) as runtime dependency after update to setuptools_scm will prevent its py2 version from installing that is all. I just don't want to break any other packages depending on setuptools_scm(py2) if any.
> Index: pkg/PLIST > > =================================================================== > > RCS file: /cvs/ports/textproc/py-toml/pkg/PLIST,v > > retrieving revision 1.3 > > diff -u -p -r1.3 PLIST > > --- pkg/PLIST 3 Nov 2020 13:52:14 -0000 1.3 > > +++ pkg/PLIST 30 Jan 2021 07:57:15 -0000 > > @@ -1,6 +1,4 @@ > > -@comment $OpenBSD: PLIST,v 1.3 2020/11/03 13:52:14 jasper Exp $ > > -@conflict py-toml-* > > -@pkgpath textproc/py-toml > > +@comment $OpenBSD: PLIST,v$ > There would still be a quirk: > > files/Quirks.pm > 507: 'py-toml' => 'py3-toml', Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.1136 diff -u -p -r1.1136 Makefile --- devel/quirks/Makefile 25 Jan 2021 14:21:29 -0000 1.1136 +++ devel/quirks/Makefile 30 Jan 2021 12:14:21 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.524 +PKGNAME = quirks-3.525 PKG_ARCH = * MAINTAINER = Marc Espie <[email protected]> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1152 diff -u -p -r1.1152 Quirks.pm --- devel/quirks/files/Quirks.pm 25 Jan 2021 14:21:29 -0000 1.1152 +++ devel/quirks/files/Quirks.pm 30 Jan 2021 12:14:21 -0000 @@ -504,7 +504,6 @@ my $stem_extensions = { 'py-carbon' => 'py3-carbon', 'py-elftools' => 'py3-elftools', 'py-lockfile' => 'py3-lockfile', - 'py-toml' => 'py3-toml', 'py-textfsm' => 'py3-textfsm', 'py-unicodecsv' => 'py3-unicodecsv', 'py-enchant' => 'py3-enchant', Index: textproc/py-toml/Makefile =================================================================== RCS file: /cvs/ports/textproc/py-toml/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- textproc/py-toml/Makefile 3 Nov 2020 13:52:13 -0000 1.7 +++ textproc/py-toml/Makefile 30 Jan 2021 12:14:49 -0000 @@ -17,6 +17,6 @@ MODPY_SETUPTOOLS = Yes MODPY_PYTEST = Yes FLAVORS = python3 -FLAVOR ?= python3 +FLAVOR ?= .include <bsd.port.mk> Index: textproc/py-toml/pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/py-toml/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- textproc/py-toml/pkg/PLIST 3 Nov 2020 13:52:14 -0000 1.3 +++ textproc/py-toml/pkg/PLIST 30 Jan 2021 12:14:49 -0000 @@ -1,6 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2020/11/03 13:52:14 jasper Exp $ -@conflict py-toml-* -@pkgpath textproc/py-toml +@comment $OpenBSD: PLIST,v$ lib/python${MODPY_VERSION}/site-packages/toml/ lib/python${MODPY_VERSION}/site-packages/toml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ lib/python${MODPY_VERSION}/site-packages/toml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
