Here's a diff to update cloudpickle and switch to 3-only.
Fixes textproc/libxmlbird build with py3.8
devel/py-doit still builds ok with py3.7, ports using doit to build still work
devel/spyder still builds and runs (only lightly tested)
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1996
diff -u -p -r1.1996 Makefile
--- Makefile 30 Jun 2020 05:06:28 -0000 1.1996
+++ Makefile 2 Jul 2020 21:40:18 -0000
@@ -1380,7 +1380,6 @@
SUBDIR += py-click-threading,python3
SUBDIR += py-clint
SUBDIR += py-clint,python3
- SUBDIR += py-cloudpickle
SUBDIR += py-cloudpickle,python3
SUBDIR += py-codestyle
SUBDIR += py-codestyle,python3
Index: py-cloudpickle/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-cloudpickle/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- py-cloudpickle/Makefile 23 Nov 2019 19:26:52 -0000 1.9
+++ py-cloudpickle/Makefile 2 Jul 2020 21:40:18 -0000
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2019/11/23 19:26:52 kmos Exp $
COMMENT = extended pickling support for Python objects
-MODPY_EGG_VERSION = 0.5.2
+MODPY_EGG_VERSION = 1.5.0
DISTNAME = cloudpickle-${MODPY_EGG_VERSION}
PKGNAME = py-cloudpickle-${MODPY_EGG_VERSION}
CATEGORIES = devel
-REVISION = 0
HOMEPAGE = https://github.com/cloudpipe/cloudpickle
MAINTAINER = Brian Callahan <[email protected]>
@@ -19,9 +18,11 @@ MODPY_PI = Yes
MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
www/py-tornado${MODPY_FLAVOR}
+
+TEST_ENV = PYTHONPATH=".:tests:tests/cloudpickle_testpkg"
.include <bsd.port.mk>
Index: py-cloudpickle/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-cloudpickle/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- py-cloudpickle/distinfo 24 Nov 2017 17:01:11 -0000 1.4
+++ py-cloudpickle/distinfo 2 Jul 2020 21:40:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (cloudpickle-0.5.2.tar.gz) =
sOY92J7VKFFxpXAYZ1G8m4RJNnXpnhJ4nppdxUkO9VQ=
-SIZE (cloudpickle-0.5.2.tar.gz) = 24329
+SHA256 (cloudpickle-1.5.0.tar.gz) =
ggySRc697HJXIRy+iHRRAdXWoEK8oRM21469SJfdvII=
+SIZE (cloudpickle-1.5.0.tar.gz) = 50992
Index: py-cloudpickle/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-cloudpickle/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- py-cloudpickle/pkg/PLIST 14 Nov 2017 16:16:05 -0000 1.4
+++ py-cloudpickle/pkg/PLIST 2 Jul 2020 21:40:18 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2017/11/14 16:16:05 bcallah Exp $
+@pkgpath devel/py-cloudpickle
lib/python${MODPY_VERSION}/site-packages/cloudpickle/
lib/python${MODPY_VERSION}/site-packages/cloudpickle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/cloudpickle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -9,4 +10,8 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cloudpickle/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/cloudpickle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cloudpickle/${MODPY_PYCACHE}cloudpickle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cloudpickle/${MODPY_PYCACHE}cloudpickle_fast.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cloudpickle/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cloudpickle/cloudpickle.py
+lib/python${MODPY_VERSION}/site-packages/cloudpickle/cloudpickle_fast.py
+lib/python${MODPY_VERSION}/site-packages/cloudpickle/compat.py
Index: quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.983
diff -u -p -r1.983 Makefile
--- quirks/Makefile 30 Jun 2020 18:06:36 -0000 1.983
+++ quirks/Makefile 2 Jul 2020 21:40:18 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.375
+PKGNAME = quirks-3.376
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1001
diff -u -p -r1.1001 Quirks.pm
--- quirks/files/Quirks.pm 30 Jun 2020 18:06:36 -0000 1.1001
+++ quirks/files/Quirks.pm 2 Jul 2020 21:40:18 -0000
@@ -436,6 +436,7 @@ my $stem_extensions = {
'svgpart' => 'svgpart-kf5',
'kdenetwork-filesharing' => 'kdenetwork-filesharing-kf5',
'spidermonkey60' => 'spidermonkey68',
+ 'py-cloudpickle' => 'py3-cloudpickle',
};
my $obsolete_reason = {
On 2020/07/02 14:33, Stuart Henderson wrote:
> I've done a bulk build to assess what's needed to move the default
> py3 version to 3.8. Various Linux distros are using Python 3.8 already
> and I think even LTS are moving to it so fallout is mostly already
> fixed upstream. (3.7 is now on "security fixes only").
>
> I've committed fixes for some minor fallout that can be done pre switch,
> some others are simpler to fix at the time of switching which I've fixed
> locally, here are the remaining ones - if anyone can help out with getting
> these ports updated/fixed that would be appreciated.
>
> There may be some runtime fallout too but it's very unlikely we'll find
> that until we switch. This is a good time in the release cycle to make
> this move so there's enough time to find and fix before OpenBSD 6.8!
>
> www/seamonkey Could not find gconf-2.0
> -> seems repeatable but I don't understand why py3 would be involved
> so maybe it's fallout from something else
>
> graphics/vulkan-tools 'time' has no attribute 'clock'
> -> port is outdated; this was fixed as part of larger commit (looks like
> it was in 1.1.119),
> https://github.com/KhronosGroup/Vulkan-Tools/commit/6a0ba2cdd
>
> textproc/libxmlbird TypeError
> -> comes from cloudpickle used by py-doit used by libxmlbird.
> -> cloudpickle needs updating to at least 1.1.1 (some newer versions break
> py2 but I think that will be ok, ports depending on it are py3)
>
> sysutils/salt cannot import name 'linux_distribution' from
> 'platform'
> -> https://github.com/saltstack/salt/issues/55310
> -> "no longer referenced in Salt code as of the upcoming 3001 (Sodium)
> release"
> -> probably fixed with https://github.com/saltstack/salt/commit/fe075aaace
>
