diff --git a/srcpkgs/python-jupyter_core/template b/srcpkgs/python-jupyter_core/template index 25f0b83c356..768b7d1b43f 100644 --- a/srcpkgs/python-jupyter_core/template +++ b/srcpkgs/python-jupyter_core/template @@ -1,12 +1,11 @@ # Template file for 'python-jupyter_core' pkgname=python-jupyter_core version=4.2.0 -revision=2 +revision=3 noarch=yes wrksrc="jupyter_core-${version}" build_style=python-module -python_versions="2.7 3.4" -hostmakedepends="python-setuptools python3.4-setuptools" +hostmakedepends="python-setuptools python3-setuptools" depends="python-traitlets" pycompile_module="jupyter_core jupyter.py" short_desc="Jupyter core package (Python2)" @@ -17,26 +16,32 @@ distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz" checksum=44ec837a53bebf4e937112d3f9ccf31fee4f8db3e406dd0dd4f0378a354bed9c alternatives=" - jupyter-core:jupyter:/usr/bin/jupyter2.7 - jupyter-core:jupyter-migrate:/usr/bin/jupyter-migrate2.7" + jupyter-core:jupyter:/usr/bin/jupyter2 + jupyter-core:jupyter-migrate:/usr/bin/jupyter-migrate2" post_install() { vlicense COPYING.md LICENSE } -python3.4-jupyter_core_package() { +python3-jupyter_core_package() { alternatives=" - jupyter-core:jupyter:/usr/bin/jupyter3.4 - jupyter-core:jupyter-migrate:/usr/bin/jupyter-migrate3.4" + jupyter-core:jupyter:/usr/bin/jupyter3 + jupyter-core:jupyter-migrate:/usr/bin/jupyter-migrate3" noarch=yes - depends="python3.4-traitlets" - pycompile_version="3.4" + depends="python3-traitlets" pycompile_module="jupyter_core jupyter.py" - short_desc="${short_desc/Python2/Python3.4}" + replaces="python3.4-jupyter_core>=0" + short_desc="${short_desc/Python2/Python3}" pkg_install() { - vmove usr/bin/jupyter3.4 - vmove usr/bin/jupyter-migrate3.4 - vmove usr/lib/python3.4 + vmove usr/bin/jupyter3 + vmove usr/bin/jupyter-migrate3 + vmove usr/lib/python3* vlicense COPYING.md LICENSE } } +python3.4-jupyter_core_package() { + noarch=yes + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-jupyter_core>=${version}_${revision}" +} diff --git a/srcpkgs/python3-jupyter_core b/srcpkgs/python3-jupyter_core new file mode 120000 index 00000000000..9672d649470 --- /dev/null +++ b/srcpkgs/python3-jupyter_core @@ -0,0 +1 @@ +python-jupyter_core \ No newline at end of file