Diff below updates py-nbconvert to 5.3.1. Changes:
https://github.com/jupyter/nbconvert/blob/5.3.1/docs/source/changelog.rst.
Newer versions of py-nbconvert are available, which require several
dependencies to be updated. This is something for another day.
Changes to the port:
- python2 flavor has been dropped, migrated to python3-only
- switch HOMEPAGE to https
Testing:
- 'make test' runs successfully
- run tested in combination with jupyter-notebook
Consumers are already python3-only.
OK?
diff --git Makefile Makefile
index 416fdaf1c1a..257681e1493 100644
--- Makefile
+++ Makefile
@@ -2,14 +2,13 @@
COMMENT = converting Jupyter notebooks
-MODPY_EGG_VERSION = 5.2.1
+MODPY_EGG_VERSION = 5.3.1
DISTNAME = nbconvert-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
-HOMEPAGE = http://jupyter.org/
+HOMEPAGE = https://jupyter.org/
# BSD
PERMIT_PACKAGE = Yes
@@ -22,26 +21,24 @@ MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = nbconvert
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
-RUN_DEPENDS = devel/py-entrypoints${MODPY_FLAVOR} \
- devel/py-jupyter_client${MODPY_FLAVOR}>=5.0.0 \
- devel/py-jupyter_core${MODPY_FLAVOR}>=4.3.0 \
- devel/py-nbformat${MODPY_FLAVOR}>=4.3.0 \
+RUN_DEPENDS = devel/py-entrypoints${MODPY_FLAVOR}>=0.2.2 \
+ devel/py-jupyter_core${MODPY_FLAVOR} \
+ devel/py-nbformat${MODPY_FLAVOR}>=4.4 \
devel/py-testpath${MODPY_FLAVOR} \
- devel/py-traitlets${MODPY_FLAVOR} \
- textproc/py-mistune${MODPY_FLAVOR} \
- textproc/py-pandocfilters${MODPY_FLAVOR} \
+ devel/py-traitlets${MODPY_FLAVOR}>=4.2 \
+ textproc/py-mistune${MODPY_FLAVOR}>=0.7.4 \
+ textproc/py-pandocfilters${MODPY_FLAVOR}>=1.4.1 \
textproc/py-pygments${MODPY_FLAVOR} \
www/py-bleach${MODPY_FLAVOR} \
- www/py-jinja2${MODPY_FLAVOR} \
- www/py-tornado${MODPY_FLAVOR}>=4.2
+ www/py-jinja2${MODPY_FLAVOR}
TEST_DEPENDS = ${BASE_PKGPATH}=${MODPY_EGG_VERSION} \
- devel/ipython${MODPY_FLAVOR}>=5.1.0 \
- devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2 \
- devel/py-nose${MODPY_FLAVOR}
+ devel/py-ipykernel${MODPY_FLAVOR} \
+ devel/py-jupyter_client${MODPY_FLAVOR}>=4.2 \
+ devel/py-nose${MODPY_FLAVOR} \
+ www/py-tornado${MODPY_FLAVOR}>=4.0
-post-install:
- mv ${PREFIX}/bin/jupyter-nbconvert{,${MODPY_BIN_SUFFIX}}
+PORTHOME = ${WRKDIR}
.include <bsd.port.mk>
diff --git distinfo distinfo
index 79a8de4ccdb..18c216e1920 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (nbconvert-5.2.1.tar.gz) = ntaOx/6QqGcrQ3lbKeqRzHXqNVyD3ryD69EhcVIewnQ=
-SIZE (nbconvert-5.2.1.tar.gz) = 510937
+SHA256 (nbconvert-5.3.1.tar.gz) = ErGkZx1EY6tzr25MvMlltiJU4F0YLNVJld2g0O+eLbk=
+SIZE (nbconvert-5.3.1.tar.gz) = 516541
diff --git patches/patch-nbconvert_exporters_html_py
patches/patch-nbconvert_exporters_html_py
index a7cc95ae2f8..38e9ffa1696 100644
--- patches/patch-nbconvert_exporters_html_py
+++ patches/patch-nbconvert_exporters_html_py
@@ -3,7 +3,8 @@ $OpenBSD: patch-nbconvert_exporters_html_py,v 1.1 2017/05/25
11:45:25 shadchin E
Index: nbconvert/exporters/html.py
--- nbconvert/exporters/html.py.orig
+++ nbconvert/exporters/html.py
-@@ -1,3 +1,4 @@
+@@ -1,4 +1,5 @@
+ # -*- coding: utf-8 -*-
+# coding: utf-8
"""HTML Exporter class"""
diff --git patches/patch-nbconvert_filters_markdown_mistune_py
patches/patch-nbconvert_filters_markdown_mistune_py
index 2e745e822ef..7983abac3ee 100644
--- patches/patch-nbconvert_filters_markdown_mistune_py
+++ patches/patch-nbconvert_filters_markdown_mistune_py
@@ -3,7 +3,8 @@ $OpenBSD: patch-nbconvert_filters_markdown_mistune_py,v 1.1
2017/05/25 11:45:25
Index: nbconvert/filters/markdown_mistune.py
--- nbconvert/filters/markdown_mistune.py.orig
+++ nbconvert/filters/markdown_mistune.py
-@@ -1,3 +1,4 @@
+@@ -1,4 +1,5 @@
+ # -*- coding: utf-8 -*-
+# coding: utf-8
"""Markdown filters with mistune
diff --git pkg/PLIST pkg/PLIST
index 0d17d5c47fc..e59d7da9d07 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.5 2017/05/25 11:45:25 shadchin Exp $
-bin/jupyter-nbconvert${MODPY_BIN_SUFFIX}
+@conflict py-nbconvert-*
+@pkgpath devel/py-nbconvert
+bin/jupyter-nbconvert
lib/python${MODPY_VERSION}/site-packages/nbconvert/
lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -166,6 +168,7 @@
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/${MODPY_PYCACHE
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/${MODPY_PYCACHE}regexremove.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/${MODPY_PYCACHE}sanitize.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/${MODPY_PYCACHE}svg2pdf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/${MODPY_PYCACHE}tagremove.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/base.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/clearoutput.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/coalescestreams.py
@@ -178,6 +181,7 @@
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/latex.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/regexremove.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/sanitize.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/svg2pdf.py
+lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tagremove.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}/
@@ -194,6 +198,7 @@
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_P
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_regexremove.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_sanitize.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_svg2pdf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_tagremove.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/base.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/fake_kernelmanager.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/files/
@@ -218,6 +223,7 @@
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/test_late
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/test_regexremove.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/test_sanitize.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/test_svg2pdf.py
+lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/test_tagremove.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/resources/
lib/python${MODPY_VERSION}/site-packages/nbconvert/resources/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbconvert/resources/${MODPY_PYCACHE}/
