Newer versions of py-jupyter_client and ipython are python3-only. In preparation of updating these two ports I have been slowly migrating their consumers away from python2. rpointel@ recently committed an update of plaso (consumer of ipython), which has been switched to python3 as well.
What remains are a couple of ports that need to be migrated at the same time. Rationale is that these ports all depend upon each other. Splitting up the diff below therefore doesn't make sense. Ports: - devel/ipython - devel/py-ipykernel - devel/py-jupyter_client - devel/py-jupyter_core - devel/py-nbformat - devel/py-traitlets Consumers of the above are already python3-only. Other changes: - switch HOMEPAGE devel/ipython to https Testing: - Build tested ports and their consumers Comments/OK? diff --git devel/Makefile devel/Makefile index 429e62f65f0..849ed5cdcef 100644 --- devel/Makefile +++ devel/Makefile @@ -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 @@ -1710,7 +1705,6 @@ SUBDIR += py-tox SUBDIR += py-tox,python3 SUBDIR += py-traceback2 - SUBDIR += py-traitlets SUBDIR += py-traitlets,python3 SUBDIR += py-trollius SUBDIR += py-twisted diff --git devel/ipython/Makefile devel/ipython/Makefile index 18f71bf9154..03029eb6934 100644 --- devel/ipython/Makefile +++ devel/ipython/Makefile @@ -3,8 +3,9 @@ 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. diff --git devel/ipython/pkg/PLIST devel/ipython/pkg/PLIST index 4146be3c30e..c5c48c97f01 100644 --- devel/ipython/pkg/PLIST +++ devel/ipython/pkg/PLIST @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.24 2018/10/31 12:37:34 bket Exp $ +@conflict ipython-* +@pkgpath devel/ipython bin/iptest${MODPY_BIN_SUFFIX} @comment bin/iptest2 @comment bin/iptest3 diff --git devel/py-ipykernel/Makefile devel/py-ipykernel/Makefile index 0dc6baf6a5a..81f69643b64 100644 --- devel/py-ipykernel/Makefile +++ devel/py-ipykernel/Makefile @@ -5,7 +5,7 @@ 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 diff --git devel/py-ipykernel/pkg/PLIST devel/py-ipykernel/pkg/PLIST index ab3ccabcd1e..5019fbcc1c1 100644 --- devel/py-ipykernel/pkg/PLIST +++ devel/py-ipykernel/pkg/PLIST @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.5 2018/10/31 12:38:38 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 diff --git devel/py-jupyter_client/Makefile devel/py-jupyter_client/Makefile index fbf9f9f8d39..405577549a2 100644 --- devel/py-jupyter_client/Makefile +++ devel/py-jupyter_client/Makefile @@ -3,6 +3,7 @@ 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> diff --git devel/py-jupyter_client/pkg/PLIST devel/py-jupyter_client/pkg/PLIST index 928673d9606..ef9fb1560d2 100644 --- devel/py-jupyter_client/pkg/PLIST +++ 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} +@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 diff --git devel/py-jupyter_core/Makefile devel/py-jupyter_core/Makefile index 3d81ad9043f..5cc3c2deea7 100644 --- devel/py-jupyter_core/Makefile +++ devel/py-jupyter_core/Makefile @@ -3,6 +3,7 @@ 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> diff --git devel/py-jupyter_core/pkg/PLIST devel/py-jupyter_core/pkg/PLIST index 2b1f7a38d70..d0dde9c7875 100644 --- devel/py-jupyter_core/pkg/PLIST +++ 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} +@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/ diff --git devel/py-nbformat/Makefile devel/py-nbformat/Makefile index c56fab2ad65..fbe2a4473f8 100644 --- devel/py-nbformat/Makefile +++ devel/py-nbformat/Makefile @@ -3,6 +3,7 @@ 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> diff --git devel/py-nbformat/pkg/PLIST devel/py-nbformat/pkg/PLIST index 242481a7f3b..27495166dfe 100644 --- devel/py-nbformat/pkg/PLIST +++ 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} +@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 diff --git devel/py-traitlets/Makefile devel/py-traitlets/Makefile index 18f91d8cdb9..b8c4442266b 100644 --- devel/py-traitlets/Makefile +++ devel/py-traitlets/Makefile @@ -5,11 +5,11 @@ 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> diff --git devel/py-traitlets/pkg/PLIST devel/py-traitlets/pkg/PLIST index 77ee65c48a3..765120fbdb7 100644 --- devel/py-traitlets/pkg/PLIST +++ devel/py-traitlets/pkg/PLIST @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.4 2016/10/02 11:08:14 shadchin 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