From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6850313881E for ; Wed, 23 Sep 2015 10:20:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EFD221C002; Wed, 23 Sep 2015 10:20:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6761721C018 for ; Wed, 23 Sep 2015 10:19:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 777FB3409FC for ; Wed, 23 Sep 2015 10:19:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 922D623C for ; Wed, 23 Sep 2015 10:19:55 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1442990308.d4eea6844d07b4bacd9354ba58c25709cc21958a.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-python/nbconvert/ X-VCS-Repository: proj/sci X-VCS-Files: dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild dev-python/nbconvert/nbconvert-9999.ebuild X-VCS-Directories: dev-python/nbconvert/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: d4eea6844d07b4bacd9354ba58c25709cc21958a X-VCS-Branch: master Date: Wed, 23 Sep 2015 10:19:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0ca5a428-586a-487a-86b3-99462485099b X-Archives-Hash: 5a1182bfa395aed457cdf1ba7323c5e2 commit: d4eea6844d07b4bacd9354ba58c25709cc21958a Author: Marius Brehler linux sungazer de> AuthorDate: Wed Sep 23 06:38:28 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Sep 23 06:38:28 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d4eea684 dev-python/nbconvert: Replace symlink dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild | 79 +++++++++++++++++++++++++- dev-python/nbconvert/nbconvert-9999.ebuild | 15 ++--- 2 files changed, 82 insertions(+), 12 deletions(-) diff --git a/dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild b/dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild deleted file mode 120000 index ac4dd41..0000000 --- a/dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -nbconvert-9999.ebuild \ No newline at end of file diff --git a/dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild b/dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild new file mode 100644 index 0000000..9e298f3 --- /dev/null +++ b/dev-python/nbconvert/nbconvert-4.0.0-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python{3_3,3_4} ) + +inherit distutils-r1 + +MY_PN="nbconvert" + +DESCRIPTION="Converting Jupyter Notebooks" +HOMEPAGE="http://jupyter.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="BSD" +SLOT="0" +IUSE="doc test" + +PATCHES=( + "${FILESDIR}/${P}"-docs-Makefile.patch + "${FILESDIR}/${P}"-pandoc-highlighting.patch +) + +RDEPEND=" + dev-python/jupyter_core[${PYTHON_USEDEP}] + dev-python/nbformat[${PYTHON_USEDEP}] + dev-python/mistune[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/traitlets[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + doc? ( + dev-python/ipython[${PYTHON_USEDEP}] + dev-python/jupyter_client[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + app-text/pandoc + ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/ipykernel[${PYTHON_USEDEP}] + ) + " + +python_prepare_all() { + # Prevent un-needed download during build + if use doc; then + sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die + fi + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + distutils_install_for_testing + cd "${TEST_DIR}"/lib || die + nosetests --with-coverage --cover-package=nbconvert nbconvert || die +} + +python_install_all() { + use doc && HTML_DOCS=( docs/build/html/. ) + distutils-r1_python_install_all +} + +pkg_postinst() { + if ! has_version app-text/pandoc ; then + einfo "Pandoc is required for converting to formats other than Python," + einfo "HTML, and Markdown. If you need this functionality, install" + einfo "app-text/pandoc." + fi +} diff --git a/dev-python/nbconvert/nbconvert-9999.ebuild b/dev-python/nbconvert/nbconvert-9999.ebuild index 297f7bf..c97ed8a 100644 --- a/dev-python/nbconvert/nbconvert-9999.ebuild +++ b/dev-python/nbconvert/nbconvert-9999.ebuild @@ -5,27 +5,20 @@ EAPI=5 PYTHON_COMPAT=( python2_7 python{3_3,3_4} ) -inherit distutils-r1 +inherit distutils-r1 git-r3 MY_PN="nbconvert" DESCRIPTION="Converting Jupyter Notebooks" HOMEPAGE="http://jupyter.org" - -PATCHES=( "${FILESDIR}/${PN}"-4.0.0-docs-Makefile.patch ) -if [ ${PV} == "9999" ] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/jupyter/${MY_PN}.git git://github.com/jupyter/${MY_PN}.git" - else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - PATCHES+=( "${FILESDIR}"/${P}-pandoc-highlighting.patch ) -fi +EGIT_REPO_URI="https://github.com/jupyter/${MY_PN}.git git://github.com/jupyter/${MY_PN}.git" LICENSE="BSD" SLOT="0" IUSE="doc test" +PATCHES=( "${FILESDIR}/${PN}"-4.0.0-docs-Makefile.patch ) + RDEPEND=" dev-python/jupyter_core[${PYTHON_USEDEP}] dev-python/nbformat[${PYTHON_USEDEP}]