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.
# 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
@pkgpath lang/python3.5,-gdbm
@pkgpath lang/python3.6,-gdbm
+@pkgpath lang/python/3.5,-gdbm
+@pkgpath lang/python/3.6,-gdbm
@so lib/python3.7/lib-dynload/_gdbm.so
Index: pkg/PLIST-idle
===================================================================
RCS file: /cvs/ports/lang/python/3.7/pkg/PLIST-idle,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST-idle
--- pkg/PLIST-idle 11 Dec 2019 19:55:40 -0000 1.5
+++ pkg/PLIST-idle 3 Feb 2020 20:45:02 -0000
@@ -1,11 +1,12 @@
@comment $OpenBSD: PLIST-idle,v 1.5 2019/12/11 19:55:40 sthen Exp $
@option no-default-conflict
@option is-branch
-@conflict python-idle->=3.7,<3.8
+@conflict python-idle->=3,<3.8
@conflict python->=3.6,<3.6.8p0
-@conflict python-idle->=3.6,<3.6.8p2
@pkgpath lang/python3.5,-idle
@pkgpath lang/python3.6,-idle
+@pkgpath lang/python/3.5,-idle
+@pkgpath lang/python/3.6,-idle
bin/idle3
bin/idle3.7
lib/python3.7/idlelib/
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.7/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -u -r1.9 PLIST-main
--- pkg/PLIST-main 28 Dec 2019 18:35:39 -0000 1.9
+++ pkg/PLIST-main 3 Feb 2020 20:45:02 -0000
@@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST-main,v 1.9 2019/12/28 18:35:39 kmos Exp $
@option no-default-conflict
@option is-branch
-@conflict python->=3.7,<3.8
-@conflict python->=3,<3.6.8p2
+@conflict python->=3,<3.8
@pkgpath lang/python3.5,-main
@pkgpath lang/python3.6,-main
+@pkgpath lang/python/3.5,-main
+@pkgpath lang/python/3.6,-main
@comment bin/2to3
bin/2to3-3.7
bin/pydoc3
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/3.7/pkg/PLIST-tests,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST-tests
--- pkg/PLIST-tests 28 Dec 2019 18:35:39 -0000 1.5
+++ pkg/PLIST-tests 3 Feb 2020 20:45:02 -0000
@@ -1,10 +1,12 @@
@comment $OpenBSD: PLIST-tests,v 1.5 2019/12/28 18:35:39 kmos Exp $
@option no-default-conflict
@option is-branch
-@conflict python-tests->=3.7,<3.8
+@conflict python-tests->=3,<3.8
@conflict python->=3.6,<3.6.8p0
@pkgpath lang/python3.5,-tests
@pkgpath lang/python3.6,-tests
+@pkgpath lang/python/3.5,-tests
+@pkgpath lang/python/3.6,-tests
lib/python3.7/test/
lib/python3.7/test/Sine-1000Hz-300ms.aif
lib/python3.7/test/__init__.py
Index: pkg/PLIST-tkinter
===================================================================
RCS file: /cvs/ports/lang/python/3.7/pkg/PLIST-tkinter,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST-tkinter
--- pkg/PLIST-tkinter 11 Dec 2019 19:55:40 -0000 1.4
+++ pkg/PLIST-tkinter 3 Feb 2020 20:45:02 -0000
@@ -1,9 +1,11 @@
@comment $OpenBSD: PLIST-tkinter,v 1.4 2019/12/11 19:55:40 sthen Exp $
@option no-default-conflict
@option is-branch
-@conflict python-tkinter->=3.7,<3.8
+@conflict python-tkinter->=3,<3.8
@pkgpath lang/python3.5,-tkinter
@pkgpath lang/python3.6,-tkinter
+@pkgpath lang/python/3.5,-tkinter
+@pkgpath lang/python/3.6,-tkinter
@so lib/python3.7/lib-dynload/_tkinter.so
lib/python3.7/tkinter/
lib/python3.7/tkinter/__init__.py
--
Regards,
Mikolaj
