diff --git a/srcpkgs/python-jupyter_nbconvert/python3.4-jupyter_nbconvert.INSTALL.msg b/srcpkgs/python-jupyter_nbconvert/python3-jupyter_nbconvert.INSTALL.msg similarity index 68% rename from srcpkgs/python-jupyter_nbconvert/python3.4-jupyter_nbconvert.INSTALL.msg rename to srcpkgs/python-jupyter_nbconvert/python3-jupyter_nbconvert.INSTALL.msg index 38eb9520d74..5efba6bbb86 100644 --- a/srcpkgs/python-jupyter_nbconvert/python3.4-jupyter_nbconvert.INSTALL.msg +++ b/srcpkgs/python-jupyter_nbconvert/python3-jupyter_nbconvert.INSTALL.msg @@ -1,2 +1,2 @@ To convert notebooks to formats other than HTML and markdown install -python3.4-Sphinx and/or pandoc. +python3-Sphinx and/or pandoc. diff --git a/srcpkgs/python-jupyter_nbconvert/template b/srcpkgs/python-jupyter_nbconvert/template index faf0cdfb968..bf2bfd51694 100644 --- a/srcpkgs/python-jupyter_nbconvert/template +++ b/srcpkgs/python-jupyter_nbconvert/template @@ -1,12 +1,11 @@ # Template file for 'python-jupyter_nbconvert' pkgname=python-jupyter_nbconvert version=4.2.0 -revision=3 +revision=4 noarch=yes wrksrc="nbconvert-${version}" build_style=python-module -python_versions="2.7 3.4" -hostmakedepends="python-setuptools python3.4-setuptools" +hostmakedepends="python-setuptools python3-setuptools" depends="python-mistune python-Jinja2 python-Pygments python-traitlets python-jupyter_core python-jupyter_nbformat python-entrypoints" pycompile_module="nbconvert" @@ -16,23 +15,29 @@ homepage="https://github.com/jupyter/nbconvert" license="3-clause-BSD" distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz" checksum=55946d7522741294fcdd50799bd1777d16673ce721fecca0610cdb86749863c6 -alternatives="jupyter-nbconvert:jupyter-nbconvert:/usr/bin/jupyter-nbconvert2.7" +alternatives="jupyter-nbconvert:jupyter-nbconvert:/usr/bin/jupyter-nbconvert2" post_install() { vlicense COPYING.md LICENSE } -python3.4-jupyter_nbconvert_package() { +python3-jupyter_nbconvert_package() { noarch=yes - depends="python3.4-mistune python3.4-Jinja2 python3.4-Pygments python3.4-traitlets - python3.4-jupyter_core python3.4-jupyter_nbformat python3.4-entrypoints" - pycompile_version="3.4" + depends="python3-mistune python3-Jinja2 python3-Pygments python3-traitlets + python3-jupyter_core python3-jupyter_nbformat python3-entrypoints" pycompile_module="nbconvert" - short_desc="${short_desc/Python2/Python3.4}" - alternatives="jupyter-nbconvert:jupyter-nbconvert:/usr/bin/jupyter-nbconvert3.4" + replaces="python3.4-jupyter_nbconvert>=0" + short_desc="${short_desc/Python2/Python3}" + alternatives="jupyter-nbconvert:jupyter-nbconvert:/usr/bin/jupyter-nbconvert3" pkg_install() { - vmove usr/bin/jupyter-nbconvert3.4 - vmove usr/lib/python3.4 + vmove usr/bin/jupyter-nbconvert3 + vmove usr/lib/python3* vlicense COPYING.md LICENSE } } +python3.4-jupyter_nbconvert_package() { + noarch=yes + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-jupyter_nbconvert>=${version}_${revision}" +} diff --git a/srcpkgs/python3-jupyter_nbconvert b/srcpkgs/python3-jupyter_nbconvert new file mode 120000 index 00000000000..441bbee041a --- /dev/null +++ b/srcpkgs/python3-jupyter_nbconvert @@ -0,0 +1 @@ +python-jupyter_nbconvert \ No newline at end of file