By making these two ports python3 only, we are getting rid of the only
consumers of the obsolete devel/py-trollius port (which can then be
deleted after diff below goes in).
These ports are only used by devel/py-buildbot which is already
python3-only.
ok?
(diff shows quirks and top-level makefile diffs for completeness)
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2038
diff -u -p -u -r1.2038 Makefile
--- devel/Makefile 19 Nov 2020 07:19:54 -0000 1.2038
+++ devel/Makefile 22 Nov 2020 05:11:34 -0000
@@ -1728,7 +1728,6 @@
SUBDIR += py-trollius
SUBDIR += py-twisted
SUBDIR += py-twisted,python3
- SUBDIR += py-txaio
SUBDIR += py-txaio,python3
SUBDIR += py-typing
SUBDIR += py-typing-extensions,python3
Index: www/Makefile
===================================================================
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.987
diff -u -p -u -r1.987 Makefile
--- www/Makefile 6 Nov 2020 18:18:37 -0000 1.987
+++ www/Makefile 22 Nov 2020 05:11:34 -0000
@@ -415,7 +415,6 @@
SUBDIR += py-CherryPy
SUBDIR += py-CherryPy,python3
SUBDIR += py-aiohttp
- SUBDIR += py-autobahn
SUBDIR += py-autobahn,python3
SUBDIR += py-beaker
SUBDIR += py-beaker,python3
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1097
diff -u -p -u -r1.1097 Makefile
--- devel/quirks/Makefile 20 Nov 2020 05:41:11 -0000 1.1097
+++ devel/quirks/Makefile 22 Nov 2020 05:11:34 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.489
+PKGNAME = quirks-3.490
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1115
diff -u -p -u -r1.1115 Quirks.pm
--- devel/quirks/files/Quirks.pm 20 Nov 2020 05:41:11 -0000 1.1115
+++ devel/quirks/files/Quirks.pm 22 Nov 2020 05:11:34 -0000
@@ -511,6 +511,8 @@ my $stem_extensions = {
'py-pygresql' => 'py3-pygresql',
'py-tagpy' => 'py3-tagpy',
'py-mpd2' => 'py3-mpd2',
+ 'py-autobahn' => 'py3-autobahn',
+ 'py-txaio' => 'py3-txaio',
};
my $obsolete_reason = {
Index: devel/py-txaio/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-txaio/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- devel/py-txaio/Makefile 3 Jul 2020 21:12:51 -0000 1.7
+++ devel/py-txaio/Makefile 22 Nov 2020 05:11:34 -0000
@@ -19,13 +19,8 @@ MODPY_PI = Yes
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
MODPY_SETUPTOOLS = Yes
-
-.if empty (FLAVOR)
-RUN_DEPENDS = devel/py-future \
- devel/py-trollius
-.endif
.include <bsd.port.mk>
Index: devel/py-txaio/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-txaio/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- devel/py-txaio/pkg/PLIST 23 Jun 2018 17:33:04 -0000 1.2
+++ devel/py-txaio/pkg/PLIST 22 Nov 2020 05:11:34 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2018/06/23 17:33:04 landry Exp $
+@conflict py-txaio-*
+@pkgpath devel/py-txaio
lib/python${MODPY_VERSION}/site-packages/txaio/
lib/python${MODPY_VERSION}/site-packages/txaio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/txaio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: www/py-autobahn/Makefile
===================================================================
RCS file: /cvs/ports/www/py-autobahn/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- www/py-autobahn/Makefile 3 Jul 2020 21:13:18 -0000 1.6
+++ www/py-autobahn/Makefile 22 Nov 2020 05:11:34 -0000
@@ -20,16 +20,12 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
BUILD_DEPENDS = devel/py-txaio${MODPY_FLAVOR}>=18.8.1 \
devel/py-six${MODPY_FLAVOR}
-.if empty (FLAVOR)
-TEST_DEPENDS = devel/py-unittest2 \
- devel/py-trollius
-.else
+
# requires an update to unittest and then traceback2 and linecache2
NO_TEST = Yes
-.endif
.include <bsd.port.mk>
Index: www/py-autobahn/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/py-autobahn/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- www/py-autobahn/pkg/PLIST 23 Apr 2019 16:43:01 -0000 1.3
+++ www/py-autobahn/pkg/PLIST 22 Nov 2020 05:11:34 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2019/04/23 16:43:01 landry Exp $
+@conflict py-autobahn-*
+@pkgpath www/py-autobahn
lib/python${MODPY_VERSION}/site-packages/autobahn/
lib/python${MODPY_VERSION}/site-packages/autobahn-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/autobahn-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
