Remove python2 FLAVOR, migrate to python3 by default.

- devel/ipython - devel/py-jupyter_client - devel/py-jupyter_core - devel/py-nbformat - devel/py-traitlets - devel/py-ipykernel These need to be migrated at the same time as they depend upon each other. "reads fine for me" edd@ (MAINTAINER ipython) OK paco@
2020-03-23 05:05:02 +00:00 · 2020-03-23 05:05:02 +00:00 · f27b76e27a
commit f27b76e27a
parent a46e37fbf7
13 changed files with 54 additions and 89 deletions
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1955 2020/03/20 11:39:36 mariani Exp $
+# $OpenBSD: Makefile,v 1.1956 2020/03/23 05:05:02 bket Exp $

     SUBDIR =
     SUBDIR += 64tass
@ -277,7 +277,6 @@
     SUBDIR += include-what-you-use
     SUBDIR += iniparser
     SUBDIR += intellij
-     SUBDIR += ipython
     SUBDIR += ipython,python3
     SUBDIR += iso-codes
     SUBDIR += itcl
@ -1494,7 +1493,6 @@
     SUBDIR += py-iniparse
     SUBDIR += py-intervaltree
     SUBDIR += py-intervaltree,python3
-     SUBDIR += py-ipykernel
     SUBDIR += py-ipykernel,python3
     SUBDIR += py-ipython_genutils
     SUBDIR += py-ipython_genutils,python3
@ -1515,9 +1513,7 @@
     SUBDIR += py-jsonrpclib
     SUBDIR += py-jsonschema
     SUBDIR += py-jsonschema,python3
-     SUBDIR += py-jupyter_client
     SUBDIR += py-jupyter_client,python3
-     SUBDIR += py-jupyter_core
     SUBDIR += py-jupyter_core,python3
     SUBDIR += py-kitchen,python3
     SUBDIR += py-kiwisolver
@ -1551,7 +1547,6 @@
     SUBDIR += py-munch,python3
     SUBDIR += py-mxDateTime
     SUBDIR += py-nbconvert,python3
-     SUBDIR += py-nbformat
     SUBDIR += py-nbformat,python3
     SUBDIR += py-nbval,python3
     SUBDIR += py-nose
@ -1709,7 +1704,6 @@
     SUBDIR += py-tox
     SUBDIR += py-tox,python3
     SUBDIR += py-traceback2
-     SUBDIR += py-traitlets
     SUBDIR += py-traitlets,python3
     SUBDIR += py-trollius
     SUBDIR += py-twisted
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.52 2019/11/24 19:40:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2020/03/23 05:05:03 bket Exp $

 COMMENT=		enhanced interactive Python shell

 MODPY_EGG_VERSION =	5.8.0
-REVISION =		2
+REVISION =		3
 DISTNAME=		ipython-${MODPY_EGG_VERSION}
+PKGNAME =		ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
 CATEGORIES=		devel

 HOMEPAGE=		https://ipython.org/
@ -20,6 +21,7 @@ RUN_DEPENDS =		devel/py-decorator${MODPY_FLAVOR} \
 			devel/desktop-file-utils \
 			devel/py-pexpect${MODPY_FLAVOR} \
 			devel/py-prompt_toolkit${MODPY_FLAVOR} \
+			math/py-numpy${MODPY_FLAVOR} \
 			textproc/py-pygments${MODPY_FLAVOR}

 # Note that if you have pdb++ installed, tests will fail.
@ -41,16 +43,7 @@ PERMIT_PACKAGE=	Yes
 MODPY_PI =		Yes

 FLAVORS =		python3
-FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-PKGNAME =		ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
-RUN_DEPENDS +=		math/py-numpy,python3
-.else
-RUN_DEPENDS +=		devel/py-backports-shutil-get-terminal-size \
-			devel/py-pathlib2
-TEST_DEPENDS +=		devel/py-mock
-.endif
+FLAVOR =		python3

 # Despite the fact that setupbase.py defines paths for examples to
 # be installed into, we still have to do it manually for some reason.
@ -62,11 +55,7 @@ post-install:
 	chown -R ${SHAREOWN}:${SHAREGRP} \
 		${WRKSRC}/examples/IPython\ Kernel/ipython.desktop
 	mv ${WRKSRC}/examples/IPython\ Kernel/ipython.desktop \
-		${APPS_DIR}/ipython${MODPY_BIN_SUFFIX}.desktop
-
-	mv ${PREFIX}/bin/ipython ${PREFIX}/bin/ipython${MODPY_BIN_SUFFIX}
-	mv ${PREFIX}/bin/iptest ${PREFIX}/bin/iptest${MODPY_BIN_SUFFIX}
-	mv ${PREFIX}/man/man1/ipython.1 ${PREFIX}/man/man1/ipython${MODPY_BIN_SUFFIX}.1
+		${APPS_DIR}/ipython.desktop

 pre-build:
 	${SUBST_CMD} ${WRKBUILD}/IPython/core/tests/test_interactiveshell.py
@ -74,6 +63,6 @@ pre-build:

 do-test:
 	env LC_CTYPE=en_US.UTF-8 PYTHONNOUSERSITE=1 \
-		${LOCALBASE}/bin/iptest${MODPY_BIN_SUFFIX}
+		${LOCALBASE}/bin/iptest

 .include <bsd.port.mk>
--- a/devel/ipython/pkg/PLIST
+++ b/devel/ipython/pkg/PLIST
@ -1,9 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.24 2018/10/31 12:37:34 bket Exp $
-bin/iptest${MODPY_BIN_SUFFIX}
+@comment $OpenBSD: PLIST,v 1.25 2020/03/23 05:05:03 bket Exp $
+@conflict ipython-*
+@pkgpath devel/ipython
@comment bin/iptest2
-@comment bin/iptest3
-bin/ipython${MODPY_BIN_SUFFIX}
@comment bin/ipython2
+bin/iptest
+@comment bin/iptest3
+bin/ipython
@comment bin/ipython3
 lib/python${MODPY_VERSION}/site-packages/IPython/
 lib/python${MODPY_VERSION}/site-packages/IPython/__init__.py
@ -665,6 +667,6 @@ lib/python${MODPY_VERSION}/site-packages/IPython/utils/version.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/warn.py
 lib/python${MODPY_VERSION}/site-packages/IPython/utils/wildcard.py
 lib/python${MODPY_VERSION}/site-packages/ipython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
-@man man/man1/ipython${MODPY_BIN_SUFFIX}.1
-share/applications/ipython${MODPY_BIN_SUFFIX}.desktop
@tag update-desktop-database
+@man man/man1/ipython.1
+share/applications/ipython.desktop
--- a/devel/py-ipykernel/Makefile
+++ b/devel/py-ipykernel/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2019/07/12 20:45:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2020/03/23 05:05:03 bket Exp $

 COMMENT =		IPython kernel for Jupyter

 MODPY_EGG_VERSION =	4.10.0
 DISTNAME =		ipykernel-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2

 PORTROACH=		limit:^4

@ -32,11 +32,7 @@ MODULES =		lang/python
 MODPY_PI =		Yes

 FLAVORS =		python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS +=		devel/py-mock
-.endif
+FLAVOR =		python3

 do-test:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} ipykernel
--- a/devel/py-ipykernel/pkg/PLIST
+++ b/devel/py-ipykernel/pkg/PLIST
@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.5 2018/10/31 12:38:38 bket Exp $
+@comment $OpenBSD: PLIST,v 1.6 2020/03/23 05:05:03 bket Exp $
+@conflict py-ipykernel-*
+@pkgpath devel/py-ipykernel
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ipykernel_launcher.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ipykernel/
 lib/python${MODPY_VERSION}/site-packages/ipykernel-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
--- a/devel/py-jupyter_client/Makefile
+++ b/devel/py-jupyter_client/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2020/02/16 05:21:04 bket Exp $
+# $OpenBSD: Makefile,v 1.14 2020/03/23 05:05:03 bket Exp $

 COMMENT =		Jupyter protocol implementation and client libraries

 MODPY_EGG_VERSION =	5.3.4
+REVISION =		0
 DISTNAME =		jupyter_client-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}

@ -30,20 +31,8 @@ TEST_DEPENDS =		devel/ipython${MODPY_FLAVOR} \
 			shells/bash

 FLAVORS =		python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS +=		devel/py-mock
-.endif
+FLAVOR =		python3

 PORTHOME =		${WRKDIR}

-# Python 2 only: regression tests require a fair number of openfiles, an
-# increase to 768 is needed.
-
-post-install:
-	mv ${PREFIX}/bin/jupyter-kernel{,${MODPY_BIN_SUFFIX}}
-	mv ${PREFIX}/bin/jupyter-kernelspec{,${MODPY_BIN_SUFFIX}}
-	mv ${PREFIX}/bin/jupyter-run{,${MODPY_BIN_SUFFIX}}
-
 .include <bsd.port.mk>
--- a/devel/py-jupyter_client/pkg/PLIST
+++ b/devel/py-jupyter_client/pkg/PLIST
@ -1,7 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.5 2018/12/29 11:53:38 mariani Exp $
-bin/jupyter-kernel${MODPY_BIN_SUFFIX}
-bin/jupyter-kernelspec${MODPY_BIN_SUFFIX}
-bin/jupyter-run${MODPY_BIN_SUFFIX}
+@comment $OpenBSD: PLIST,v 1.6 2020/03/23 05:05:03 bket Exp $
+@conflict py-jupyter_client-*
+@pkgpath devel/py-jupyter_client
+bin/jupyter-kernel
+bin/jupyter-kernelspec
+bin/jupyter-run
 lib/python${MODPY_VERSION}/site-packages/jupyter_client/
 lib/python${MODPY_VERSION}/site-packages/jupyter_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/jupyter_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
--- a/devel/py-jupyter_core/Makefile
+++ b/devel/py-jupyter_core/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2020/02/16 05:20:29 bket Exp $
+# $OpenBSD: Makefile,v 1.12 2020/03/23 05:05:03 bket Exp $

 COMMENT =		Jupyter core package

 MODPY_EGG_VERSION =	4.6.1
+REVISION =		0
 DISTNAME =		jupyter_core-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}

@ -24,17 +25,8 @@ TEST_DEPENDS =		devel/py-ipykernel${MODPY_FLAVOR} \
 			devel/py-nose$(MODPY_FLAVOR)

 FLAVORS =		python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS +=		devel/py-mock
-.endif
+FLAVOR =		python3

 PORTHOME =		${WRKDIR}

-post-install:
-	mv ${PREFIX}/bin/jupyter{,${MODPY_BIN_SUFFIX}}
-	mv ${PREFIX}/bin/jupyter-migrate{,${MODPY_BIN_SUFFIX}}
-	mv ${PREFIX}/bin/jupyter-troubleshoot{,${MODPY_BIN_SUFFIX}}
-
 .include <bsd.port.mk>
--- a/devel/py-jupyter_core/pkg/PLIST
+++ b/devel/py-jupyter_core/pkg/PLIST
@ -1,7 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/12/13 14:46:43 shadchin Exp $
-bin/jupyter${MODPY_BIN_SUFFIX}
-bin/jupyter-migrate${MODPY_BIN_SUFFIX}
-bin/jupyter-troubleshoot${MODPY_BIN_SUFFIX}
+@comment $OpenBSD: PLIST,v 1.3 2020/03/23 05:05:03 bket Exp $
+@conflict py-jupyter_core-*
+@pkgpath devel/py-jupyter_core
+bin/jupyter
+bin/jupyter-migrate
+bin/jupyter-troubleshoot
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}jupyter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_core/
--- a/devel/py-nbformat/Makefile
+++ b/devel/py-nbformat/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2020/03/15 10:21:13 bket Exp $
+# $OpenBSD: Makefile,v 1.11 2020/03/23 05:05:03 bket Exp $

 COMMENT =		Jupyter notebook format

 MODPY_EGG_VERSION =	4.4.0
+REVISION =		0
 DISTNAME =		nbformat-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}

@ -25,9 +26,6 @@ MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	nbformat

 FLAVORS =		python3
-FLAVOR ?=
-
-post-install:
-	mv ${PREFIX}/bin/jupyter-trust ${PREFIX}/bin/jupyter-trust${MODPY_BIN_SUFFIX}
+FLAVOR =		python3

 .include <bsd.port.mk>
--- a/devel/py-nbformat/pkg/PLIST
+++ b/devel/py-nbformat/pkg/PLIST
@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2020/03/15 10:21:13 bket Exp $
-bin/jupyter-trust${MODPY_BIN_SUFFIX}
+@comment $OpenBSD: PLIST,v 1.4 2020/03/23 05:05:03 bket Exp $
+@conflict py-nbformat-*
+@pkgpath devel/py-nbformat
+bin/jupyter-trust
 lib/python${MODPY_VERSION}/site-packages/nbformat/
 lib/python${MODPY_VERSION}/site-packages/nbformat-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/nbformat/__init__.py
--- a/devel/py-traitlets/Makefile
+++ b/devel/py-traitlets/Makefile
@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.14 2019/07/12 20:45:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2020/03/23 05:05:03 bket Exp $

 COMMENT =		configuration system for Python applications

 MODPY_EGG_VERSION =	4.3.2
 DISTNAME =		traitlets-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2

 CATEGORIES =		devel

-HOMEPAGE =		http://ipython.org/
+HOMEPAGE =		https://ipython.org/

 # BSD
 PERMIT_PACKAGE =	Yes
@ -25,11 +25,6 @@ MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	traitlets

 FLAVORS =		python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS +=		devel/py-enum34
-TEST_DEPENDS +=		devel/py-mock
-.endif
+FLAVOR =		python3

 .include <bsd.port.mk>
--- a/devel/py-traitlets/pkg/PLIST
+++ b/devel/py-traitlets/pkg/PLIST
@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.4 2016/10/02 11:08:14 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.5 2020/03/23 05:05:03 bket Exp $
+@conflict py-traitlets-*
+@pkgpath devel/py-traitlets
 lib/python${MODPY_VERSION}/site-packages/traitlets/
 lib/python${MODPY_VERSION}/site-packages/traitlets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/traitlets/__init__.py