From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1407398-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8AB28158091
for <garchives@archives.gentoo.org>; Sun, 12 Jun 2022 14:52:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A8A0FE0917;
Sun, 12 Jun 2022 14:52:15 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 933EBE0917
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jun 2022 14:52:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5775F341BDF
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jun 2022 14:52:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CA1024FB
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jun 2022 14:52:12 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1655045506.95ae6318501dd4228f3f208dbb4c56d7985cea6e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/nbdime/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/nbdime/nbdime-3.1.1-r1.ebuild
X-VCS-Directories: dev-python/nbdime/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 95ae6318501dd4228f3f208dbb4c56d7985cea6e
X-VCS-Branch: master
Date: Sun, 12 Jun 2022 14:52:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e8077632-d4ec-4dc1-a92b-6fec50bec4d3
X-Archives-Hash: b580c96c81a1ed3e5302816a88b766c5
commit: 95ae6318501dd4228f3f208dbb4c56d7985cea6e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 14:42:38 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 14:51:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ae6318
dev-python/nbdime: fix distutils-r1 usage
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-python/nbdime/nbdime-3.1.1-r1.ebuild | 79 ++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/dev-python/nbdime/nbdime-3.1.1-r1.ebuild b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..f4d2cdfa60ff
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="webtools"
+
+RDEPEND="
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/GitPython[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/jupyter_server[${PYTHON_USEDEP}]
+ dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
+ dev-python/nbformat[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ www-servers/tornado[${PYTHON_USEDEP}]
+ webtools? ( net-libs/nodejs[npm] )"
+BDEPEND="
+ test? (
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/notebook[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/tabulate[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_sphinx docs/source \
+ dev-python/recommonmark \
+ dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+ # yield tests were removed in pytest 4.0
+ sed -i -e 's/test_offline_mathjax/_&/' \
+ -e 's/test_api_merge/_&/' \
+ -e 's/test_fetch_merge/_&/' \
+ -e 's/test_api_diff/_&/' \
+ -e 's/test_fetch_diff/_&/' \
+ nbdime/tests/test_web.py || die
+ sed -i -e 's/test_git_difftool/_&/' \
+ nbdime/tests/test_server_extension.py || die
+ # reason: [NOTRUN] flaws in deep diffing of lists, not identifying almost equal sublists
+ sed -i -e 's/test_deep_merge_lists_delete_no_conflict__currently_expected_failures/_&/' \
+ nbdime/tests/test_merge.py || die
+ sed -i -e 's/test_diff_to_json_patch/_&/' \
+ nbdime/tests/test_diff_json_conversion.py || die
+ sed -i -e 's/test_build_diffs_unsorted/_&/' \
+ nbdime/tests/test_decision_tools.py || die
+ sed -i -e 's/test_merge_multiline_cell_source_conflict/_&/' \
+ -e 's/test_merge_interleave_cell_add_remove/_&/' \
+ -e 's/test_merge_conflicts_get_diff_indices_shifted/_&/' \
+ -e 's/test_merge_inserts_within_deleted_range/_&/' \
+ nbdime/tests/test_merge_notebooks.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ use webtools || DISTUTILS_ARGS=( --skip-npm )
+}
+
+src_test() {
+ # user.email and user.name are not configured in the sandbox
+ git config --global user.email "larry@gentoo.org" || die
+ git config --global user.name "Larry the Cow" || die
+
+ distutils-r1_src_test
+}