On 2020/02/03 20:55, Mikolaj Kucharski wrote: > Hi, > > I've noticed recently that I still have python3.6 on my RPi and I think > pkgpaths in python3.7 are not exactly correct. With inlined diff test > upgrade works for me.
yes, I have been looking at this also (I noticed because it breaks pkg_add -u if you go to -current from a version before the switch to py3.7 as default, after I upgraded quite a few machines recently). funnily enough I just started a test build when I read your mail. > # env \ > TRUSTED_PKG_PATH=/home/ports/packages/%a/all/ \ > PKG_PATH=https://cdn.openbsd.org/pub/OpenBSD/%c/packages/%a/ \ > pkg_add -n -u > quirks-3.216 signed on 2020-01-04T15:56:06Z > py3-setuptools-41.6.0v0:python-3.6.9+python-3.7.6->python-3.7.6p0: ok > # echo $? > 0 > > I've looked a bit at history of Pythons in ports tree and I also > tested version of the diff with something a long the lines of: > > +@pkgpath lang/python/3.2,-gdbm > +@pkgpath lang/python/3.3,-gdbm > +@pkgpath lang/python/3.4,-gdbm > +@pkgpath lang/python/3.5,-gdbm > +@pkgpath lang/python/3.6,-gdbm > @pkgpath lang/python3.5,-gdbm > @pkgpath lang/python3.6,-gdbm > +@pkgpath lang/python3/3.2,-gdbm > +@pkgpath lang/python3/3.3,-gdbm > +@pkgpath lang/python3/3.4,-gdbm > +@pkgpath lang/python3/3.5,-gdbm > +@pkgpath lang/python3/3.6,-gdbm > +@pkgpath lang/python3/3.7,-gdbm > > for every Python subpackage, but I'm not sure is it practically > necessary to go that long in time for an upgrade path. Comments > welcome. > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/lang/python/3.7/Makefile,v > retrieving revision 1.13 > diff -u -p -u -r1.13 Makefile > --- Makefile 28 Dec 2019 18:35:39 -0000 1.13 > +++ Makefile 3 Feb 2020 20:45:02 -0000 > @@ -9,6 +9,7 @@ VERSION = 3.7 > PATCHLEVEL = .6 > SHARED_LIBS = python3.7m 0.0 > VERSION_SPEC = >=3.7,<3.8 > +REVISION = 0 > > CONFIGURE_ARGS += --with-ensurepip=no > CONFIGURE_ARGS += --enable-loadable-sqlite-extensions > Index: pkg/PLIST-gdbm > =================================================================== > RCS file: /cvs/ports/lang/python/3.7/pkg/PLIST-gdbm,v > retrieving revision 1.4 > diff -u -p -u -r1.4 PLIST-gdbm > --- pkg/PLIST-gdbm 11 Dec 2019 19:55:40 -0000 1.4 > +++ pkg/PLIST-gdbm 3 Feb 2020 20:45:02 -0000 > @@ -1,7 +1,9 @@ > @comment $OpenBSD: PLIST-gdbm,v 1.4 2019/12/11 19:55:40 sthen Exp $ > @option no-default-conflict > @option is-branch > -@conflict python-gdbm->=3.7,<3.8 > +@conflict python-gdbm->=3,<3.8 this should be split in two ("conflict with 'this' version of python" which should be present for all subpkgs, and "conflict with old versions to provide an upgrade path"). > @pkgpath lang/python3.5,-gdbm > @pkgpath lang/python3.6,-gdbm ha, these two @pkgpath are totally bogus and are repeated in a bunch of subpackages. they should be removed rather than just adding the fixed ones. > +@pkgpath lang/python/3.5,-gdbm > +@pkgpath lang/python/3.6,-gdbm > @so lib/python3.7/lib-dynload/_gdbm.so I'll work up an alternative diff and send out after tests.
