[gentoo-commits] proj/sci:master commit in: dev-python/nbdime/

[Marius Brehler]

commit:     0b3ba056ced20ead3a07563291e0b0dc227787ae
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue Jan  3 10:33:05 2017 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Jan  3 10:33:05 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0b3ba056

dev-python/nbdime: Update live ebuild according to 0.1.0

Package-Manager: portage-2.3.0

 dev-python/nbdime/metadata.xml       | 12 +++++++++++-
 dev-python/nbdime/nbdime-9999.ebuild | 28 ++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index 979d02b..b2a229d 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>marbre@××××××××××××××.de</email>
+    <name>Marius Brehler</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci@g.o</email>
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription>
-    nbdime contains tools for diffing and merging of Jupyter Notebooks.
+    nbdime provides tools for diffing and merging of Jupyter Notebooks.
   </longdescription>
   <upstream>
     <remote-id type="github">jupyter/nbdime</remote-id>
+    <remote-id type="pypi">nbdime</remote-id>
   </upstream>
+  <use>
+    <flag name="webtools">
+      Install web-based diff and merge tools.
+    </flag>
+</use>
 </pkgmetadata>

diff --git a/dev-python/nbdime/nbdime-9999.ebuild b/dev-python/nbdime/nbdime-9999.ebuild
index 8be6e65..96bf532 100644
--- a/dev-python/nbdime/nbdime-9999.ebuild
+++ b/dev-python/nbdime/nbdime-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,25 +14,41 @@ EGIT_REPO_URI="https://github.com/jupyter/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
+IUSE="test webtools"
 
 RDEPEND="
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	webtools? ( net-libs/nodejs[npm] )
 	"
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	)
 	"
-# Some additional packages (e.g. commonmark, recommonmark) are required to build the docs
+# The package recommonmark is required to build the docs, not in portage yet.
 # Furthermore, backports.shutil_which is required for python2_7.
 
+python_configure_all() {
+	if ! use webtools; then
+		mydistutilsargs=( --skip-npm )
+	fi
+}
+
 python_test() {
+	# user.email and user.name are not configured in the sandbox.
+	git config --global user.email "you@×××××××.com" || die
+	git config --global user.name "Your Name" || die
+
 	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	cp -r "${S}/${PN}"/tests "${TEST_DIR}"/lib/ || die
+
 	py.test -l || die
 }