Hi,
This diff updates py-nbconvert to the latest release.
Tested on amd64.
Need py-pandocfilters and py-bleach (on ports@)
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-nbconvert/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 14 Dec 2016 07:59:49 -0000 1.3
+++ Makefile 6 Jan 2017 18:01:11 -0000
@@ -2,7 +2,7 @@
COMMENT = converting Jupyter notebooks
-MODPY_EGG_VERSION = 4.3.0
+MODPY_EGG_VERSION = 5.0.0
DISTNAME = nbconvert-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -12,27 +12,32 @@ HOMEPAGE = http://jupyter.org/
MAINTAINER = Alexandr Shadchin <shadc...@openbsd.org>
+# BSD
+PERMIT_PACKAGE_CDROM = Yes
+
+MODULES = lang/python
+
RUN_DEPENDS = devel/py-entrypoints${MODPY_FLAVOR} \
devel/py-jupyter_client${MODPY_FLAVOR}>=4.4.0 \
devel/py-jupyter_core${MODPY_FLAVOR}>=4.2.1 \
devel/py-nbformat${MODPY_FLAVOR}>=4.2.0 \
+ devel/py-testpath${MODPY_FLAVOR} \
devel/py-traitlets${MODPY_FLAVOR} \
textproc/py-mistune${MODPY_FLAVOR} \
+ textproc/py-pandocfilters${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR} \
+ www/py-bleach${MODPY_FLAVOR} \
www/py-jinja2${MODPY_FLAVOR} \
www/py-tornado${MODPY_FLAVOR}>=4.2
TEST_DEPENDS = ${BASE_PKGPATH}=${MODPY_EGG_VERSION} \
${RUN_DEPENDS} \
devel/ipython${MODPY_FLAVOR}>=5.1.0 \
- devel/py-nose${MODPY_FLAVOR} \
devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2 \
- devel/py-testpath${MODPY_FLAVOR}
-
-# BSD
-PERMIT_PACKAGE_CDROM = Yes
+ devel/py-nose${MODPY_FLAVOR} \
+ devel/py-test${MODPY_FLAVOR}
-MODULES = lang/python
MODPY_PI = Yes
+MODPY_SETUPTOOLS = Yes
FLAVORS = python3
FLAVOR ?=
@@ -41,7 +46,6 @@ post-install:
mv ${PREFIX}/bin/jupyter-nbconvert
${PREFIX}/bin/jupyter-nbconvert${MODPY_BIN_SUFFIX}
do-test:
- cd ${WRKSRC}; LC_CTYPE=en_US.UTF-8 \
- ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} nbconvert
+ cd ${WRKSRC} && LC_CTYPE=en_US.UTF-8 ${MODPY_BIN} -m pytest nbconvert
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-nbconvert/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 14 Dec 2016 07:59:49 -0000 1.3
+++ distinfo 6 Jan 2017 18:01:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (nbconvert-4.3.0.tar.gz) = 2WfsWI/9GtczYWPxrIlXo0i1xLzkRlYy20z2hP/ktxg=
-SIZE (nbconvert-4.3.0.tar.gz) = 377486
+SHA256 (nbconvert-5.0.0.tar.gz) = te0sNWaS6Gda1QeMZ02KF3ouqhzWYsFNwLT7fw+mTlw=
+SIZE (nbconvert-5.0.0.tar.gz) = 393256
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-nbconvert/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 14 Dec 2016 07:59:49 -0000 1.3
+++ pkg/PLIST 6 Jan 2017 18:01:12 -0000
@@ -1,7 +1,13 @@
@comment $OpenBSD: PLIST,v 1.3 2016/12/14 07:59:49 shadchin Exp $
bin/jupyter-nbconvert${MODPY_BIN_SUFFIX}
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/
+lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/nbconvert-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/nbconvert/__init__.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbconvert/${MODPY_PYCACHE}/
@@ -14,8 +20,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}asciidoc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}export.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}exporter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}exporter_locator.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}html.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}latex.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}markdown.${MODPY_PYC_MAGIC_TAG}pyc
@@ -26,8 +35,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}script.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}slides.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/${MODPY_PYCACHE}templateexporter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/asciidoc.py
+lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/base.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/export.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/exporter.py
+lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/exporter_locator.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/html.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/latex.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/markdown.py
@@ -44,6 +56,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/${MODPY_PYCACHE}cheese.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/${MODPY_PYCACHE}test_asciidoc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/${MODPY_PYCACHE}test_export.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/${MODPY_PYCACHE}test_exporter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/${MODPY_PYCACHE}test_html.${MODPY_PYC_MAGIC_TAG}pyc
@@ -63,6 +76,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/files/pngmetadata.ipynb
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/files/prompt_numbers.ipynb
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/files/rawtest.ipynb
+lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/test_asciidoc.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/test_export.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/test_exporter.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/exporters/tests/test_html.py
@@ -82,20 +96,24 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}ansi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}citation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}datatypefilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}filter_links.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}highlight.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}latex.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}markdown.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}markdown_mistune.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}pandoc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/${MODPY_PYCACHE}strings.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/ansi.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/citation.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/datatypefilter.py
+lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/filter_links.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/highlight.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/latex.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/markdown.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/markdown_mistune.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/metadata.py
+lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/pandoc.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/strings.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/tests/
lib/python${MODPY_VERSION}/site-packages/nbconvert/filters/tests/__init__.py
@@ -145,6 +163,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/${MODPY_PYCACHE}extractoutput.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/${MODPY_PYCACHE}highlightmagics.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/${MODPY_PYCACHE}latex.${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/base.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/clearoutput.py
@@ -155,12 +174,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/extractoutput.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/highlightmagics.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/latex.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/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}/
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}fake_kernelmanager.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_clearoutput.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_coalescestreams.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_csshtmlheader.${MODPY_PYC_MAGIC_TAG}pyc
@@ -168,8 +189,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_extractoutput.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_highlightmagics.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/${MODPY_PYCACHE}test_latex.${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/base.py
+lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/fake_kernelmanager.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/files/
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/files/Clear
Output.ipynb
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/files/Disable
Stdin.ipynb
@@ -188,6 +211,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/test_extractoutput.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/test_highlightmagics.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/preprocessors/tests/test_latex.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/resources/
lib/python${MODPY_VERSION}/site-packages/nbconvert/resources/__init__.py
@@ -196,6 +220,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/resources/style.min.css
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/README.md
+lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/asciidoc.tpl
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/html/
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/html/basic.tpl
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/html/full.tpl
@@ -204,6 +229,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/latex/
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/latex/article.tplx
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/latex/base.tplx
+lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/latex/document_contents.tplx
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/latex/report.tplx
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/latex/skeleton/
lib/python${MODPY_VERSION}/site-packages/nbconvert/templates/latex/skeleton/display_priority.tplx
@@ -245,6 +271,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/nbconvert/tests/files/hello.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/tests/files/jupyter_nbconvert_config.py
lib/python${MODPY_VERSION}/site-packages/nbconvert/tests/files/latex-linked-image.ipynb
+lib/python${MODPY_VERSION}/site-packages/nbconvert/tests/files/markdown_display_priority.ipynb
lib/python${MODPY_VERSION}/site-packages/nbconvert/tests/files/notebook1.ipynb
lib/python${MODPY_VERSION}/site-packages/nbconvert/tests/files/notebook2.ipynb
lib/python${MODPY_VERSION}/site-packages/nbconvert/tests/files/notebook3_with_errors.ipynb
