On Thu, Jul 09, 2020 at 01:21:00AM +0200, Klemens Nanni wrote:
> There are no py2 consumers of these two ports in our tree:
>
> $ show-reverse-deps devel/py-astroid
> devel/pylint
> devel/pylint,-gui
> devel/pylint,-main
> devel/pylint,python3
> devel/pylint,python3,-gui
> devel/pylint,python3,-main
> devel/spyder/spyder,python3
> meta/gnome
> meta/gnome,-extras
> meta/gnome,-main
> x11/gnome/totem
> $ show-reverse-deps devel/pylint
> devel/pylint,-gui
> devel/pylint,python3,-gui
> devel/spyder/spyder,python3
> meta/gnome
> meta/gnome,-extras
> meta/gnome,-main
> x11/gnome/totem
>
> gnome depends on totem which uses ${MODY_DEFAULT_VERSION_3}.
>
> Can we remove py2 versions of pylint and py-astroid? If so, I'd
> appreciate double checking of pylint's @conflict and @pkgpath markers.
>
> Feedback? OK?
Ping plus updated diff after quirks changes.
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2000
diff -u -p -r1.2000 Makefile
--- devel/Makefile 7 Jul 2020 13:06:07 -0000 1.2000
+++ devel/Makefile 8 Jul 2020 23:12:01 -0000
@@ -1323,7 +1323,6 @@
SUBDIR += py-asn1,python3
SUBDIR += py-asn1-modules
SUBDIR += py-asn1-modules,python3
- SUBDIR += py-astroid
SUBDIR += py-astroid,python3
SUBDIR += py-async-timeout
SUBDIR += py-atomicwrites
@@ -1767,7 +1766,6 @@
SUBDIR += pyflakes,python3
SUBDIR += pygame
SUBDIR += pygame,python3
- SUBDIR += pylint
SUBDIR += pylint,python3
SUBDIR += pyrex
SUBDIR += pyusb
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.991
diff -u -p -r1.991 Makefile
--- devel/quirks/Makefile 10 Jul 2020 03:34:59 -0000 1.991
+++ devel/quirks/Makefile 14 Jul 2020 01:26:48 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.383
+PKGNAME = quirks-3.384
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.1009
diff -u -p -r1.1009 Quirks.pm
--- devel/quirks/files/Quirks.pm 10 Jul 2020 03:35:00 -0000 1.1009
+++ devel/quirks/files/Quirks.pm 14 Jul 2020 01:26:38 -0000
@@ -442,6 +442,9 @@ my $stem_extensions = {
'py-aiodns' => 'py3-aiodns',
'ebc' => 'bc-gh',
'py-cares' => 'py3-cares',
+ 'py-astroid' => 'py3-astroid',
+ 'pylint' => 'pylint3',
+ 'pylint-gui' => 'pylint3-gui',
};
my $obsolete_reason = {
Index: devel/pylint/Makefile
===================================================================
RCS file: /cvs/ports/devel/pylint/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- devel/pylint/Makefile 3 Jul 2020 21:12:53 -0000 1.31
+++ devel/pylint/Makefile 8 Jul 2020 23:06:33 -0000
@@ -4,8 +4,8 @@ COMMENT-main= lint-like code checker fo
COMMENT-gui= GUI for pylint
MODPY_EGG_VERSION= 1.6.5
-REVISION-gui= 2
-REVISION-main= 2
+REVISION-gui= 3
+REVISION-main= 3
DISTNAME= pylint-${MODPY_EGG_VERSION}
PKGNAME-main= pylint-${MODPY_EGG_VERSION}
PKGNAME-gui= pylint-gui-${MODPY_EGG_VERSION}
@@ -34,17 +34,12 @@ RUN_DEPENDS-gui= ${MODPY_TKINTER_DEPENDS
TEST_DEPENDS= devel/py-logilab-common${MODPY_FLAVOR}>=1.3.0
FLAVORS = python3
-FLAVOR ?=
+FLAVOR ?= python3
-.if ${FLAVOR:Mpython3}
FULLPKGNAME-main= ${PKGNAME-main:S/pylint/pylint3/}
FULLPKGPATH-main= devel/pylint,-main${MODPY_FLAVOR}
FULLPKGNAME-gui= ${PKGNAME-gui:S/pylint/pylint3/}
FULLPKGPATH-gui= devel/pylint,-gui${MODPY_FLAVOR}
-.else
-RUN_DEPENDS+= devel/py-backports-functools-lru-cache \
- devel/py-configparser
-.endif
post-install:
rm ${WRKINST}${MODPY_SITEPKG}/pylint/test/unittest_lint.py.orig
Index: devel/pylint/pkg/PLIST-gui
===================================================================
RCS file: /cvs/ports/devel/pylint/pkg/PLIST-gui,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-gui
--- devel/pylint/pkg/PLIST-gui 27 Apr 2016 12:05:02 -0000 1.2
+++ devel/pylint/pkg/PLIST-gui 8 Jul 2020 23:06:30 -0000
@@ -1,2 +1,4 @@
@comment $OpenBSD: PLIST-gui,v 1.2 2016/04/27 12:05:02 shadchin Exp $
+@conflict pylint-gui-*
+@pkgpath devel/pylint,-gui
bin/pylint-gui${MODPY_BIN_SUFFIX}
Index: devel/pylint/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/pylint/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- devel/pylint/pkg/PLIST-main 1 Sep 2016 12:36:03 -0000 1.9
+++ devel/pylint/pkg/PLIST-main 8 Jul 2020 23:17:01 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.9 2016/09/01 12:36:03 shadchin Exp $
+@conflict pylint-*
+@pkgpath devel/pylint,-main
bin/epylint${MODPY_BIN_SUFFIX}
bin/pylint${MODPY_BIN_SUFFIX}
bin/pyreverse${MODPY_BIN_SUFFIX}
Index: devel/py-astroid/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-astroid/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- devel/py-astroid/Makefile 3 Jul 2020 21:12:40 -0000 1.11
+++ devel/py-astroid/Makefile 8 Jul 2020 22:58:17 -0000
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.4.9
DISTNAME = astroid-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
-REVISION = 3
+REVISION = 4
HOMEPAGE = http://www.astroid.org/
@@ -23,7 +23,7 @@ RUN_DEPENDS = devel/py-lazy-object-prox
devel/py-wrapt${MODPY_FLAVOR}
FLAVORS = python3
-FLAVOR ?=
+FLAVOR ?= python3
do-test:
cd ${WRKSRC} && \
Index: devel/py-astroid/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-astroid/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- devel/py-astroid/pkg/PLIST 13 Jun 2016 10:59:57 -0000 1.2
+++ devel/py-astroid/pkg/PLIST 8 Jul 2020 22:58:54 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2016/06/13 10:59:57 shadchin Exp $
+@conflict py-astroid-*
+@pkgpath devel/py-astroid
@pkgpath devel/py-logilab-astng
lib/python${MODPY_VERSION}/site-packages/astroid/
lib/python${MODPY_VERSION}/site-packages/astroid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
