From 75c35334d2a57d1ae647d0538167bb0f32afdbe2 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 17 Oct 2016 09:46:11 +0200 Subject: [PATCH] python-jupyter_notebook: rebuild for Python 3.5 Switch to python3-* pkgs. Convert python3.4-* pkg into dummy pkg. --- srcpkgs/python-jupyter_notebook/template | 41 +++++++++++++----------- srcpkgs/python3-jupyter_notebook | 1 + 2 files changed, 23 insertions(+), 19 deletions(-) create mode 120000 srcpkgs/python3-jupyter_notebook diff --git a/srcpkgs/python-jupyter_notebook/template b/srcpkgs/python-jupyter_notebook/template index fc1b0b9de18..f0d35359f5e 100644 --- a/srcpkgs/python-jupyter_notebook/template +++ b/srcpkgs/python-jupyter_notebook/template @@ -1,13 +1,11 @@ # Template file for 'python-jupyter_notebook' pkgname=python-jupyter_notebook version=4.2.3 -revision=2 +revision=3 noarch=yes -replaces="python-ipython-notebook>=0" wrksrc="notebook-${version}" build_style=python-module -python_versions="2.7 3.4" -hostmakedepends="python-setuptools python3.4-setuptools" +hostmakedepends="python-setuptools python3-setuptools" depends="python-Jinja2 python-terminado python-tornado python-ipython_genutils python-traitlets python-jupyter_core python-jupyter_client python-jupyter_nbformat python-jupyter_nbconvert @@ -21,8 +19,8 @@ distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz" checksum=39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851 alternatives=" - jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook2.7 - jupyter-notebook:jupyter-nbextension:/usr/bin/jupyter-nbextension2.7" + jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook2 + jupyter-notebook:jupyter-nbextension:/usr/bin/jupyter-nbextension2" post_install() { vlicense COPYING.md LICENSE @@ -34,23 +32,28 @@ post_install() { done } -python3.4-jupyter_notebook_package() { +python3-jupyter_notebook_package() { alternatives=" - jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook3.4 - jupyter-notebook:jupyter-nbextension:/usr/bin/jupyter-nbextension3.4" + jupyter-notebook:jupyter-notebook:/usr/bin/jupyter-notebook3 + jupyter-notebook:jupyter-nbextension:/usr/bin/jupyter-nbextension3" noarch=yes - replaces="python3.4-ipython-notebook>=0" - depends="python3.4-Jinja2 python3.4-terminado python3.4-tornado - python3.4-ipython_genutils python3.4-traitlets python3.4-jupyter_core - python3.4-jupyter_client python3.4-jupyter_nbformat python3.4-jupyter_nbconvert - python3.4-ipython_ipykernel mathjax" - pycompile_version="3.4" + replaces="python3.4-jupyter_notebook>=0" + depends="python3-Jinja2 python3-terminado python3-tornado + python3-ipython_genutils python3-traitlets python3-jupyter_core + python3-jupyter_client python3-jupyter_nbformat python3-jupyter_nbconvert + python3-ipython_ipykernel mathjax" pycompile_module="notebook" - short_desc="${short_desc/Python2/Python3.4}" + short_desc="${short_desc/Python2/Python3}" pkg_install() { - vmove usr/bin/jupyter-notebook3.4 - vmove usr/bin/jupyter-nbextension3.4 - vmove usr/lib/python3.4 + vmove usr/bin/jupyter-notebook3 + vmove usr/bin/jupyter-nbextension3 + vmove usr/lib/python3* vlicense COPYING.md LICENSE } } +python3.4-jupyter_notebook_package() { + noarch=yes + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-jupyter_notebook>=${version}_${revision}" +} diff --git a/srcpkgs/python3-jupyter_notebook b/srcpkgs/python3-jupyter_notebook new file mode 120000 index 00000000000..8c3e828e727 --- /dev/null +++ b/srcpkgs/python3-jupyter_notebook @@ -0,0 +1 @@ +python-jupyter_notebook \ No newline at end of file