subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-python\/nbdime\/"

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

2024-09-21 Thread Michał Górny

commit: b04d8f50290b3a6c65a8fe3e9a591f23a4529cbe
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Sep 21 11:58:52 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Sep 21 11:58:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b04d8f50

dev-python/nbdime: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/Manifest|  1 -
 dev-python/nbdime/nbdime-4.0.1.ebuild | 58 ---
 2 files changed, 59 deletions(-)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index d4135e471c52..96a1d40b1247 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,2 +1 @@
-DIST nbdime-4.0.1.tar.gz 9414125 BLAKE2B 
bf2581cec0f71ef8949c9cf19e21aa47302b6c71bbb9861e8c6f3a4b1921e9f73460ee5059e5bc92c7789d8f0695329125725c10e10763dd6e4d388bfaee53d1
 SHA512 
df14dfe9df296d71eb4a98140fe15703ca277063a153c3159cc883c99ce98b76f5f4dae24d32b048a18d2530e52535e3d89523d7a1c54a8654d2d54c8812ded3
 DIST nbdime-4.0.2.tar.gz 9452967 BLAKE2B 
c9c390f9165d0b8b3277c7bd93e5a90f4ac23cf0d084ed8ba166254bfbfe9cc0e9f0bc35c2a86b39d84167e78639cb2ed69f6cda5da02bb113f7323a86d745a6
 SHA512 
1e923b7f719d6a33f1dc06e06511a6d48bb8bfef7d8f7676da2520edd2914014eb88f70eaaeec27af6b03f1cefbd9a3e6854a7c0dec7f76f211d750b3fd90894

diff --git a/dev-python/nbdime/nbdime-4.0.1.ebuild 
b/dev-python/nbdime/nbdime-4.0.1.ebuild
deleted file mode 100644
index 032ecd6510a0..
--- a/dev-python/nbdime/nbdime-4.0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="
-   https://jupyter.org/
-   https://github.com/jupyter/nbdime/
-   https://pypi.org/project/nbdime/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-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}]
-   dev-python/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-   test? (
-   dev-python/jsonschema[${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 pytest
-
-src_test() {
-   # user.email and user.name are not configured in the sandbox
-   git config --global user.email "la...@gentoo.org" || die
-   git config --global user.name "Larry the Cow" || die
-
-   distutils-r1_src_test
-}
-
-src_install() {
-   distutils-r1_src_install
-   mv "${ED}"{/usr,}/etc || die
-}

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

2024-09-21 Thread Arthur Zamarin

commit: 0a088f37f5eb9c645bb714b093c78bbbd2e316f4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Sep 21 11:08:21 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Sep 21 11:08:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a088f37

dev-python/nbdime: Stabilize 4.0.2 ALLARCHES, #939963

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/nbdime/nbdime-4.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-4.0.2.ebuild 
b/dev-python/nbdime/nbdime-4.0.2.ebuild
index db11041f30e0..1c23a9c53c73 100644
--- a/dev-python/nbdime/nbdime-4.0.2.ebuild
+++ b/dev-python/nbdime/nbdime-4.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2024-09-06 Thread Michał Górny

commit: 526c0066d1e40aed5493292cb0f33d974dc49310
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep  6 02:48:45 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep  6 09:25:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=526c0066

dev-python/nbdime: Bump to 4.0.2

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/Manifest|  1 +
 dev-python/nbdime/nbdime-4.0.2.ebuild | 63 +++
 2 files changed, 64 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index c47739c63c17..d4135e471c52 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,2 @@
 DIST nbdime-4.0.1.tar.gz 9414125 BLAKE2B 
bf2581cec0f71ef8949c9cf19e21aa47302b6c71bbb9861e8c6f3a4b1921e9f73460ee5059e5bc92c7789d8f0695329125725c10e10763dd6e4d388bfaee53d1
 SHA512 
df14dfe9df296d71eb4a98140fe15703ca277063a153c3159cc883c99ce98b76f5f4dae24d32b048a18d2530e52535e3d89523d7a1c54a8654d2d54c8812ded3
+DIST nbdime-4.0.2.tar.gz 9452967 BLAKE2B 
c9c390f9165d0b8b3277c7bd93e5a90f4ac23cf0d084ed8ba166254bfbfe9cc0e9f0bc35c2a86b39d84167e78639cb2ed69f6cda5da02bb113f7323a86d745a6
 SHA512 
1e923b7f719d6a33f1dc06e06511a6d48bb8bfef7d8f7676da2520edd2914014eb88f70eaaeec27af6b03f1cefbd9a3e6854a7c0dec7f76f211d750b3fd90894

diff --git a/dev-python/nbdime/nbdime-4.0.2.ebuild 
b/dev-python/nbdime/nbdime-4.0.2.ebuild
new file mode 100644
index ..db11041f30e0
--- /dev/null
+++ b/dev-python/nbdime/nbdime-4.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="
+   https://jupyter.org/
+   https://github.com/jupyter/nbdime/
+   https://pypi.org/project/nbdime/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+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}]
+   dev-python/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/jsonschema[${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 pytest
+
+src_test() {
+   # user.email and user.name are not configured in the sandbox
+   git config --global user.email "la...@gentoo.org" || die
+   git config --global user.name "Larry the Cow" || die
+
+   distutils-r1_src_test
+}
+
+python_test() {
+   local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+   epytest -p timeout -o tmp_path_retention_policy=all
+}
+
+src_install() {
+   distutils-r1_src_install
+   mv "${ED}"{/usr,}/etc || die
+}

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

2023-12-09 Thread Michał Górny

commit: d6c961d97801f2a971d3655f780794b865fbf7ea
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Dec  9 14:04:39 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Dec  9 14:04:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c961d9

dev-python/nbdime: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/Manifest|  1 -
 dev-python/nbdime/nbdime-3.2.1.ebuild | 78 ---
 2 files changed, 79 deletions(-)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index f08ddbc2ab60..c47739c63c17 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,2 +1 @@
-DIST nbdime-3.2.1.tar.gz 7642926 BLAKE2B 
245a2b0ca112574a9622855acc8db43595cd7f29f6fe2c1a1f70254984edb395817f65246613b5f41f513464fd37264f2c520237bf44570814bfa6131fdf22a8
 SHA512 
6ead97a88d587dab00df22d59adb2b80b7f81f47929a6be94b5e848a5c72f7420fac49e1a6a3b87138db75e6c1f46eef67a57a58d6e9d568b69f4e555bb7ed60
 DIST nbdime-4.0.1.tar.gz 9414125 BLAKE2B 
bf2581cec0f71ef8949c9cf19e21aa47302b6c71bbb9861e8c6f3a4b1921e9f73460ee5059e5bc92c7789d8f0695329125725c10e10763dd6e4d388bfaee53d1
 SHA512 
df14dfe9df296d71eb4a98140fe15703ca277063a153c3159cc883c99ce98b76f5f4dae24d32b048a18d2530e52535e3d89523d7a1c54a8654d2d54c8812ded3

diff --git a/dev-python/nbdime/nbdime-3.2.1.ebuild 
b/dev-python/nbdime/nbdime-3.2.1.ebuild
deleted file mode 100644
index 4f4655f22ce1..
--- a/dev-python/nbdime/nbdime-3.2.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="
-   https://jupyter.org/
-   https://github.com/jupyter/nbdime/
-   https://pypi.org/project/nbdime/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-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}]
-   dev-python/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-   test? (
-   dev-python/jsonschema[${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 pytest
-
-EPYTEST_DESELECT=(
-   nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
-   nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
-   
nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
-   
nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
-   
nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
-   
nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
-   
nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
-   nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
-   nbdime/tests/test_web.py::test_api_diff
-   nbdime/tests/test_web.py::test_api_merge
-   nbdime/tests/test_web.py::test_fetch_diff
-   nbdime/tests/test_web.py::test_fetch_merge
-   nbdime/tests/test_web.py::test_offline_mathjax
-)
-
-python_configure_all() {
-   DISTUTILS_ARGS=( --skip-npm )
-}
-
-src_test() {
-   # user.email and user.name are not configured in the sandbox
-   git config --global user.email "la...@gentoo.org" || die
-   git config --global user.name "Larry the Cow" || die
-
-   distutils-r1_src_test
-}
-
-src_install() {
-   distutils-r1_src_install
-   mv "${ED}"{/usr,}/etc || die
-}

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

2023-12-09 Thread Michał Górny

commit: 9ae5117b2eb02591c42f5f5d5195d0ac7860249f
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Dec  9 14:04:16 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Dec  9 14:04:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae5117b

dev-python/nbdime: Stabilize 4.0.1 ALLARCHES, #919534

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/nbdime-4.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-4.0.1.ebuild 
b/dev-python/nbdime/nbdime-4.0.1.ebuild
index 9e50c7b8d3c0..032ecd6510a0 100644
--- a/dev-python/nbdime/nbdime-4.0.1.ebuild
+++ b/dev-python/nbdime/nbdime-4.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-11-21 Thread Michał Górny

commit: 8c166168b34d45572ccace10ae8034d5fa210b19
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Nov 21 17:27:36 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Nov 21 19:05:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c166168

dev-python/nbdime: Bump to 4.0.1

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/Manifest|  1 +
 dev-python/nbdime/nbdime-4.0.1.ebuild | 58 +++
 2 files changed, 59 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 778acd0325ed..f08ddbc2ab60 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,2 @@
 DIST nbdime-3.2.1.tar.gz 7642926 BLAKE2B 
245a2b0ca112574a9622855acc8db43595cd7f29f6fe2c1a1f70254984edb395817f65246613b5f41f513464fd37264f2c520237bf44570814bfa6131fdf22a8
 SHA512 
6ead97a88d587dab00df22d59adb2b80b7f81f47929a6be94b5e848a5c72f7420fac49e1a6a3b87138db75e6c1f46eef67a57a58d6e9d568b69f4e555bb7ed60
+DIST nbdime-4.0.1.tar.gz 9414125 BLAKE2B 
bf2581cec0f71ef8949c9cf19e21aa47302b6c71bbb9861e8c6f3a4b1921e9f73460ee5059e5bc92c7789d8f0695329125725c10e10763dd6e4d388bfaee53d1
 SHA512 
df14dfe9df296d71eb4a98140fe15703ca277063a153c3159cc883c99ce98b76f5f4dae24d32b048a18d2530e52535e3d89523d7a1c54a8654d2d54c8812ded3

diff --git a/dev-python/nbdime/nbdime-4.0.1.ebuild 
b/dev-python/nbdime/nbdime-4.0.1.ebuild
new file mode 100644
index ..9e50c7b8d3c0
--- /dev/null
+++ b/dev-python/nbdime/nbdime-4.0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="
+   https://jupyter.org/
+   https://github.com/jupyter/nbdime/
+   https://pypi.org/project/nbdime/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+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}]
+   dev-python/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/jsonschema[${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 pytest
+
+src_test() {
+   # user.email and user.name are not configured in the sandbox
+   git config --global user.email "la...@gentoo.org" || die
+   git config --global user.name "Larry the Cow" || die
+
+   distutils-r1_src_test
+}
+
+src_install() {
+   distutils-r1_src_install
+   mv "${ED}"{/usr,}/etc || die
+}

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

2023-10-15 Thread Michał Górny

commit: a3ed0d9b9110d97928f2991fa49f46a82829ceff
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 15 15:40:32 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct 15 15:40:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ed0d9b

dev-python/nbdime: Sync kw to dev-python/notebook

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/nbdime-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.2.1.ebuild 
b/dev-python/nbdime/nbdime-3.2.1.ebuild
index 6f092705fba8..d3262fba5332 100644
--- a/dev-python/nbdime/nbdime-3.2.1.ebuild
+++ b/dev-python/nbdime/nbdime-3.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-06-27 Thread Michał Górny

commit: 89719c143e620587cbf9165f39190971aeed223e
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jun 27 11:56:04 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jun 27 11:56:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89719c14

dev-python/nbdime: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/Manifest   |   4 --
 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 101 ---
 dev-python/nbdime/nbdime-3.2.0.ebuild|  78 
 3 files changed, 183 deletions(-)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 0ce9c4b663d3..778acd0325ed 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,5 +1 @@
-DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 
767f7c848a5d840c1ac26d42f4074888163fd0bf63b774e9f79c5b7738f7f43453e35c93bdbad9cb10bb52315d67e1de6207b3463bbb885a6d095ada2bfae7ef
 SHA512 
306764a2dd8770ee5041f5ebe076c3de5da9444166de3b77c7a6c37ef1a13c57f1adecf11e99a6f812930b133ae4ec7229de61f8a789804de77abd518f2e08b4
-DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B 
cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd
 SHA512 
e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
-DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 
2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c
 SHA512 
268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
-DIST nbdime-3.2.0.tar.gz 7513703 BLAKE2B 
adfbb22e4591112b19079fed6fd7ac4db9e9169a5122cb1e9ad282ef9d07af9f3e69b84b32558af539abd5c7c010eb42182c29b4eba486159961b35cb709044e
 SHA512 
875ecd64f55b26bdb239e489022ee33ed28dd3bd459c9f8ef0c40d86011d4b024e42442cc347ab193a1ae6bec0a0a385894a381f317f74676e7e43edd3fdbea1
 DIST nbdime-3.2.1.tar.gz 7642926 BLAKE2B 
245a2b0ca112574a9622855acc8db43595cd7f29f6fe2c1a1f70254984edb395817f65246613b5f41f513464fd37264f2c520237bf44570814bfa6131fdf22a8
 SHA512 
6ead97a88d587dab00df22d59adb2b80b7f81f47929a6be94b5e848a5c72f7420fac49e1a6a3b87138db75e6c1f46eef67a57a58d6e9d568b69f4e555bb7ed60

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
deleted file mode 100644
index 10139140e53e..
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi edos2unix
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="
-   https://jupyter.org/
-   https://github.com/jupyter/nbdime/
-   https://pypi.org/project/nbdime/
-"
-SRC_URI+="
-   
https://github.com/jupyter/nbdime/commit/0e1cdaa77f57aa7f609d5ef7da26a52814c7ff74.patch
-   -> ${P}-jupyter_server2.patch
-   
https://github.com/jupyter/nbdime/commit/f67a809262b45ed0eaedc840b0e5d979eaa6965d.patch
-   -> ${P}-py3.11.patch
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-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}]
-   dev-python/tornado[${PYTHON_USEDEP}]
-"
-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 pytest
-
-PATCHES=(
-   "${DISTDIR}"/${P}-jupyter_server2.patch
-   "${DISTDIR}"/${P}-py3.11.patch
-)
-
-EPYTEST_DESELECT=(
-   nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
-   nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
-   
nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
-   
nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
-   
nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
-   
nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
-   
nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__

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

2023-06-26 Thread Jakov Smolić

commit: fa6fcca8aa106a7324cf63d17058567fc37dda0f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun 27 05:18:46 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun 27 05:18:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6fcca8

dev-python/nbdime: Stabilize 3.2.1 ALLARCHES, #909240

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-python/nbdime/nbdime-3.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.2.1.ebuild 
b/dev-python/nbdime/nbdime-3.2.1.ebuild
index bbde7615968c..6f092705fba8 100644
--- a/dev-python/nbdime/nbdime-3.2.1.ebuild
+++ b/dev-python/nbdime/nbdime-3.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-05-06 Thread Arthur Zamarin

commit: 526f0f7cc6b64a9d41e835c8b506de9b40eefd98
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:58:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:58:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=526f0f7c

dev-python/nbdime: Stabilize 3.1.1-r2 hppa, #903856

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index cc2ac26e4f8e..1089e0532526 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-05-01 Thread Arthur Zamarin

commit: 8238d67d3207bdcd8a5aa3bc75f4668d4995608c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May  1 07:16:24 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May  1 07:16:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8238d67d

dev-python/nbdime: Stabilize 3.1.1-r2 ppc, #903856

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index ce66808efe22..cc2ac26e4f8e 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-05-01 Thread Arthur Zamarin

commit: 5d2c7eee904bee074b2038384e818422c07b17c6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May  1 07:16:16 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May  1 07:16:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2c7eee

dev-python/nbdime: Stabilize 3.1.1-r2 sparc, #903856

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 93f4dbe89ebc..ce66808efe22 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-30 Thread Michał Górny

commit: 7f5d9dc472769c9a79ba7488607e74b72ac7
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May  1 04:06:57 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May  1 04:31:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5d9dc4

dev-python/nbdime: Bump to 3.2.1

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/Manifest|  1 +
 dev-python/nbdime/nbdime-3.2.1.ebuild | 78 +++
 2 files changed, 79 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 2655bceed014..0ce9c4b663d3 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -2,3 +2,4 @@ DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 
767f7c848a5d840c1ac26d42f40
 DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B 
cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd
 SHA512 
e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 
2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c
 SHA512 
268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
 DIST nbdime-3.2.0.tar.gz 7513703 BLAKE2B 
adfbb22e4591112b19079fed6fd7ac4db9e9169a5122cb1e9ad282ef9d07af9f3e69b84b32558af539abd5c7c010eb42182c29b4eba486159961b35cb709044e
 SHA512 
875ecd64f55b26bdb239e489022ee33ed28dd3bd459c9f8ef0c40d86011d4b024e42442cc347ab193a1ae6bec0a0a385894a381f317f74676e7e43edd3fdbea1
+DIST nbdime-3.2.1.tar.gz 7642926 BLAKE2B 
245a2b0ca112574a9622855acc8db43595cd7f29f6fe2c1a1f70254984edb395817f65246613b5f41f513464fd37264f2c520237bf44570814bfa6131fdf22a8
 SHA512 
6ead97a88d587dab00df22d59adb2b80b7f81f47929a6be94b5e848a5c72f7420fac49e1a6a3b87138db75e6c1f46eef67a57a58d6e9d568b69f4e555bb7ed60

diff --git a/dev-python/nbdime/nbdime-3.2.1.ebuild 
b/dev-python/nbdime/nbdime-3.2.1.ebuild
new file mode 100644
index ..b771305df768
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="
+   https://jupyter.org/
+   https://github.com/jupyter/nbdime/
+   https://pypi.org/project/nbdime/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+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}]
+   dev-python/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/jsonschema[${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 pytest
+
+EPYTEST_DESELECT=(
+   nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
+   nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
+   
nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
+   
nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
+   
nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
+   
nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
+   
nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
+   nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
+   nbdime/tests/test_web.py::test_api_diff
+   nbdime/tests/test_web.py::test_api_merge
+   nbdime/tests/test_web.py::test_fetch_diff
+   nbdime/tests/test_web.py::test_fetch_merge
+   nbdime/tests/test_web.py::test_offline_mathjax
+)
+
+python_configure_all() {
+   DISTUTILS_ARGS=( --skip-npm )
+}
+
+src_test() {
+   # user.email and user.name are not configured in the sandbox
+   git config --global user.email "la...@gentoo.org" || die
+   git config --global user.name "Larry the Cow" || die
+
+   distutils-r1_src_test
+}
+
+src_install() {
+   distutils-r1_src_install
+   mv "${ED}"{/usr,}/etc || die
+}

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

2023-04-23 Thread Sam James

commit: eb2c8f841090971005b0be3e166969c204373035
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 22:12:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 22:12:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb2c8f84

dev-python/nbdime: Stabilize 3.1.1-r2 arm, #903856

Signed-off-by: Sam James  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index a75dfbf6a8c1..93f4dbe89ebc 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-23 Thread Michał Górny

commit: e6f0b871b3c1db0bf96d88e14c6cef29002bc436
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Apr 23 18:28:33 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Apr 23 19:30:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f0b871

dev-python/nbdime: Bump to 3.2.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/Manifest|  1 +
 dev-python/nbdime/nbdime-3.2.0.ebuild | 78 +++
 2 files changed, 79 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 4ca1db8df417..2655bceed014 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,3 +1,4 @@
 DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 
767f7c848a5d840c1ac26d42f4074888163fd0bf63b774e9f79c5b7738f7f43453e35c93bdbad9cb10bb52315d67e1de6207b3463bbb885a6d095ada2bfae7ef
 SHA512 
306764a2dd8770ee5041f5ebe076c3de5da9444166de3b77c7a6c37ef1a13c57f1adecf11e99a6f812930b133ae4ec7229de61f8a789804de77abd518f2e08b4
 DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B 
cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd
 SHA512 
e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 
2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c
 SHA512 
268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
+DIST nbdime-3.2.0.tar.gz 7513703 BLAKE2B 
adfbb22e4591112b19079fed6fd7ac4db9e9169a5122cb1e9ad282ef9d07af9f3e69b84b32558af539abd5c7c010eb42182c29b4eba486159961b35cb709044e
 SHA512 
875ecd64f55b26bdb239e489022ee33ed28dd3bd459c9f8ef0c40d86011d4b024e42442cc347ab193a1ae6bec0a0a385894a381f317f74676e7e43edd3fdbea1

diff --git a/dev-python/nbdime/nbdime-3.2.0.ebuild 
b/dev-python/nbdime/nbdime-3.2.0.ebuild
new file mode 100644
index ..b771305df768
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="
+   https://jupyter.org/
+   https://github.com/jupyter/nbdime/
+   https://pypi.org/project/nbdime/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+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}]
+   dev-python/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   test? (
+   dev-python/jsonschema[${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 pytest
+
+EPYTEST_DESELECT=(
+   nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
+   nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
+   
nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
+   
nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
+   
nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
+   
nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
+   
nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
+   nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
+   nbdime/tests/test_web.py::test_api_diff
+   nbdime/tests/test_web.py::test_api_merge
+   nbdime/tests/test_web.py::test_fetch_diff
+   nbdime/tests/test_web.py::test_fetch_merge
+   nbdime/tests/test_web.py::test_offline_mathjax
+)
+
+python_configure_all() {
+   DISTUTILS_ARGS=( --skip-npm )
+}
+
+src_test() {
+   # user.email and user.name are not configured in the sandbox
+   git config --global user.email "la...@gentoo.org" || die
+   git config --global user.name "Larry the Cow" || die
+
+   distutils-r1_src_test
+}
+
+src_install() {
+   distutils-r1_src_install
+   mv "${ED}"{/usr,}/etc || die
+}

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

2023-04-23 Thread Jakov Smolić

commit: 83c89bb8afc94ae2d1c2bc7916c70e2e6597a810
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Apr 23 09:44:06 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Apr 23 09:44:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c89bb8

dev-python/nbdime: Stabilize 3.1.1-r2 amd64, #903856

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 70ee59be1ffd..a75dfbf6a8c1 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-23 Thread Jakov Smolić

commit: d9960cba899ed98f263e8a8728a4815f137b4885
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Apr 23 09:44:03 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Apr 23 09:44:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9960cba

dev-python/nbdime: Stabilize 3.1.1-r2 x86, #903856

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 5f0b124c03e6..70ee59be1ffd 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-22 Thread Sam James

commit: 5c5f6ddcf9a4e1b1d6906364caed3e3041d165ba
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 22 19:43:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 22 19:44:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5f6ddc

dev-python/nbdime: Stabilize 3.1.1-r2 ppc64, #903856

Signed-off-by: Sam James  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 9d2b8ec122c7..5f0b124c03e6 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-22 Thread Arthur Zamarin

commit: 42c89c5d306c359bdf68b13b4795931b26cb0734
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 22 16:44:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 22 16:44:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c89c5d

dev-python/nbdime: Stabilize 3.1.1-r2 arm64, #903856

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 662431f60f33..9d2b8ec122c7 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-16 Thread WANG Xuerui

commit: 3c9afa98f9cfa50bcdccf53d90cc9b1ed6ba82f0
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri Apr 14 06:32:21 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Apr 16 12:02:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9afa98

dev-python/nbdime: keyword 3.1.1-r2 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 586397731a5f..662431f60f33 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-14 Thread Sam James

commit: 9be0bdfb884bfa7338acaf0a7574b94e77048807
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 22:29:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 22:29:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be0bdfb

dev-python/nbdime: Keyword 3.1.1-r2 hppa, #904298

Signed-off-by: Sam James  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 6c5edc5ce134..586397731a5f 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-14 Thread Sam James

commit: cdf291862e9b3a9934e1cf98d36387dcf485dc87
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 21:02:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 21:02:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf29186

dev-python/nbdime: Keyword 3.1.1-r2 sparc, #904298

Signed-off-by: Sam James  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 0b5b527e4d9f..6c5edc5ce134 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-14 Thread Sam James

commit: bacb682d10f76bb0ffe282723a4dd44a55149f3b
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 20:42:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 20:43:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacb682d

dev-python/nbdime: Keyword 3.1.1-r2 s390, #904298

Signed-off-by: Sam James  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 22afdbe0742e..0b5b527e4d9f 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-14 Thread Sam James

commit: e57a32981489f82a887597b8c65206c8064402ee
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 20:24:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 20:24:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e57a3298

dev-python/nbdime: Keyword 3.1.1-r2 ppc, #904298

Signed-off-by: Sam James  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 699cb9eb91c9..22afdbe0742e 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-14 Thread Sam James

commit: c02a63e9fd21d7defe96e08cc166f02b063f14d2
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 20:06:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 20:06:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02a63e9

dev-python/nbdime: Keyword 3.1.1-r2 arm, #900178

Signed-off-by: Sam James  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 00ac13df6f87..699cb9eb91c9 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-13 Thread Sam James

commit: 62fbe1ce9f61ce0bd5d3b3d83996aeb85492b78c
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 04:17:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 04:17:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62fbe1ce

dev-python/nbdime: Keyword 3.1.1-r2 x86, #900178

Signed-off-by: Sam James  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 6c32682f2d51..6d6f82912082 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-04-13 Thread Sam James

commit: 662a8b59d766713229d7064014e6171a78457b2a
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 04:04:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 04:04:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662a8b59

dev-python/nbdime: keyword 3.1.1-r2 for ~arm64

Signed-off-by: Sam James  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 3836d40936da..6c32682f2d51 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-03-16 Thread Michał Górny

commit: dbeb553c02606090ee9a1ff1c751907200f525fe
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar 17 05:29:49 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 17 05:31:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbeb553c

dev-python/nbdime: Remove unused flag

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/metadata.xml | 5 -
 1 file changed, 5 deletions(-)

diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index 80ee16961952..214c6442b3d9 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -10,9 +10,4 @@
 nbdime
   
   
-  
-
-  Install web-based diff and merge tools.
-
-

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

2023-03-10 Thread Yixun Lan

commit: fc46c70fbf299a54ee196998e87897c1a4819724
Author: Yixun Lan  gentoo  org>
AuthorDate: Sat Mar 11 06:36:35 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Mar 11 06:36:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc46c70f

dev-python/nbdime: Keyword 3.1.1-r2 riscv, #900178

Signed-off-by: Yixun Lan  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 4587c840c4d4..6097f2e1933f 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]

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

2023-03-10 Thread Michał Górny

commit: 7b0aad30e172eea13dd155930d341d61c583b6fb
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar 10 16:48:18 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 10 19:20:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0aad30

dev-python/nbdime: Remove USE=webtools

Remove USE=webtools as it does not seem to affect the installation.
Pass --skip-npm unconditionally instead; we probably just have all
the files handy, so we don't need npm to regenerate them.

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index dd5d074199c6..4587c840c4d4 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -24,7 +24,6 @@ SRC_URI+="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="webtools"
 
 RDEPEND="
dev-python/colorama[${PYTHON_USEDEP}]
@@ -36,7 +35,6 @@ RDEPEND="
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/tornado[${PYTHON_USEDEP}]
-   webtools? ( net-libs/nodejs[npm] )
 "
 BDEPEND="
test? (
@@ -86,7 +84,7 @@ src_prepare() {
 }
 
 python_configure_all() {
-   use webtools || DISTUTILS_ARGS=( --skip-npm )
+   DISTUTILS_ARGS=( --skip-npm )
 }
 
 src_test() {

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

2023-03-10 Thread Michał Górny

commit: 5fd719287735af5f313a8b6b7db64763cbaace21
Author: jinqiang zhang  0x0  ee>
AuthorDate: Thu Mar  9 18:59:03 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 10 19:20:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd71928

dev-python/nbdime: fix tests and modernize ebuild

Closes: https://bugs.gentoo.org/900431
Signed-off-by: jinqiang zhang  0x0.ee>
Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/Manifest   |   2 +
 dev-python/nbdime/nbdime-3.1.1-r2.ebuild | 103 +++
 2 files changed, 105 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index f4b1a4c95ec7..4ca1db8df417 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,3 @@
+DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 
767f7c848a5d840c1ac26d42f4074888163fd0bf63b774e9f79c5b7738f7f43453e35c93bdbad9cb10bb52315d67e1de6207b3463bbb885a6d095ada2bfae7ef
 SHA512 
306764a2dd8770ee5041f5ebe076c3de5da9444166de3b77c7a6c37ef1a13c57f1adecf11e99a6f812930b133ae4ec7229de61f8a789804de77abd518f2e08b4
+DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B 
cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd
 SHA512 
e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 
2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c
 SHA512 
268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f

diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
new file mode 100644
index ..dd5d074199c6
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi edos2unix
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="
+   https://jupyter.org/
+   https://github.com/jupyter/nbdime/
+   https://pypi.org/project/nbdime/
+"
+SRC_URI+="
+   
https://github.com/jupyter/nbdime/commit/0e1cdaa77f57aa7f609d5ef7da26a52814c7ff74.patch
+   -> ${P}-jupyter_server2.patch
+   
https://github.com/jupyter/nbdime/commit/f67a809262b45ed0eaedc840b0e5d979eaa6965d.patch
+   -> ${P}-py3.11.patch
+"
+
+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}]
+   dev-python/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 pytest
+
+PATCHES=(
+   "${DISTDIR}"/${P}-jupyter_server2.patch
+   "${DISTDIR}"/${P}-py3.11.patch
+)
+
+EPYTEST_DESELECT=(
+   nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
+   nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
+   
nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
+   
nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
+   
nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
+   
nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
+   
nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
+   nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
+   nbdime/tests/test_web.py::test_api_diff
+   nbdime/tests/test_web.py::test_api_merge
+   nbdime/tests/test_web.py::test_fetch_diff
+   nbdime/tests/test_web.py::test_fetch_merge
+   nbdime/tests/test_web.py::test_offline_mathjax
+)
+
+src_prepare() {
+   edos2unix \
+   setupbase.py \
+   nbdime/tests/conftest.py \
+   nbdime/tests/test_cli_apps.py \
+   nbdime/tests/test_web.py \
+   nbdime/webapp/nbdim

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

2022-10-27 Thread Andrew Ammerlaan

commit: ab55d131f1802745acac68c9534ecd8eba5496a8
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Oct 27 11:29:03 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Oct 27 11:29:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab55d131

dev-python/nbdime: enable py3.11

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1-r1.ebuild 
b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
index 54632f0dad36..061fe403cb49 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1

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

2022-06-16 Thread Michał Górny

commit: 3f7857c93b82a74538f15907302d9570f2d0043a
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jun 16 08:06:19 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jun 16 08:06:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7857c9

dev-python/nbdime: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/nbdime-3.1.1.ebuild | 78 ---
 1 file changed, 78 deletions(-)

diff --git a/dev-python/nbdime/nbdime-3.1.1.ebuild 
b/dev-python/nbdime/nbdime-3.1.1.ebuild
deleted file mode 100644
index aff1fcbbdd00..
--- a/dev-python/nbdime/nbdime-3.1.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 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 "la...@gentoo.org" || die
-   git config --global user.name "Larry the Cow" || die
-   python_foreach_impl python_test
-}

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

2022-06-12 Thread Sam James

commit: 95ae6318501dd4228f3f208dbb4c56d7985cea6e
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 12 14:42:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 12 14:51:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ae6318

dev-python/nbdime: fix distutils-r1 usage

Signed-off-by: Sam James  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 ..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 "la...@gentoo.org" || die
+   git config --global user.name "Larry the Cow" || die
+
+   distutils-r1_src_test
+}

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

2022-03-24 Thread Andrew Ammerlaan

commit: 826e03a7bc72b9cc91b967938696b4c13be1417d
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Mar 24 08:26:45 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Mar 24 08:39:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=826e03a7

dev-python/nbdime: drop 3.1.0

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/nbdime/Manifest|  1 -
 dev-python/nbdime/nbdime-3.1.0.ebuild | 78 ---
 2 files changed, 79 deletions(-)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index c61651eb797f..f4b1a4c95ec7 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,2 +1 @@
-DIST nbdime-3.1.0.tar.gz 7508382 BLAKE2B 
10ca59684df06e922afbba30d5419a20490508af8bb9d4f371b1a06db49df7b665195c9aec21c3a303b3fa0c60e5c0c1e57badaba27ac81599b311f9a5000244
 SHA512 
be19fc058a918cd2aad38a8f727504a01c7830dfaba7fbf06caa0a6799770824499a70f4efe1ebf0a82847dc79d84896baf9aa86d3e7cd16dd7163023fed3855
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 
2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c
 SHA512 
268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f

diff --git a/dev-python/nbdime/nbdime-3.1.0.ebuild 
b/dev-python/nbdime/nbdime-3.1.0.ebuild
deleted file mode 100644
index 5a7c22168e01..
--- a/dev-python/nbdime/nbdime-3.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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 || mydistutilsargs=( --skip-npm )
-}
-
-src_test() {
-   # user.email and user.name are not configured in the sandbox
-   git config --global user.email "la...@gentoo.org" || die
-   git config --global user.name "Larry the Cow" || die
-   python_foreach_impl python_test
-}

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

2021-11-28 Thread Andrew Ammerlaan

commit: 3dac6ace2dfcb4c0bc5d64d87880b7c9990e3ed5
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Nov 28 14:14:37 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Nov 28 14:15:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dac6ace

dev-python/nbdime: add version 3.1.1, EAPI 8, enable py3.10

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/nbdime/Manifest|  1 +
 dev-python/nbdime/nbdime-3.1.1.ebuild | 78 +++
 2 files changed, 79 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 8eb220b0879b..c61651eb797f 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,2 @@
 DIST nbdime-3.1.0.tar.gz 7508382 BLAKE2B 
10ca59684df06e922afbba30d5419a20490508af8bb9d4f371b1a06db49df7b665195c9aec21c3a303b3fa0c60e5c0c1e57badaba27ac81599b311f9a5000244
 SHA512 
be19fc058a918cd2aad38a8f727504a01c7830dfaba7fbf06caa0a6799770824499a70f4efe1ebf0a82847dc79d84896baf9aa86d3e7cd16dd7163023fed3855
+DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 
2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c
 SHA512 
268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f

diff --git a/dev-python/nbdime/nbdime-3.1.1.ebuild 
b/dev-python/nbdime/nbdime-3.1.1.ebuild
new file mode 100644
index ..aff1fcbbdd00
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.1.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 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 "la...@gentoo.org" || die
+   git config --global user.name "Larry the Cow" || die
+   python_foreach_impl python_test
+}

[gentoo-commits] repo/gentoo:master commit in: dev-python/nbdime/, dev-python/nbdime/files/

2021-10-17 Thread Michał Górny

commit: 0374a8ddfabf84681abac96e264a1a420a0269f8
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 17 09:04:57 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct 17 09:04:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0374a8dd

dev-python/nbdime: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/Manifest |  1 -
 .../files/nbdime-2.0.0-remove-bdist_egg-hack.patch | 36 --
 dev-python/nbdime/nbdime-2.0.0-r1.ebuild   | 56 --
 3 files changed, 93 deletions(-)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 8c8d213e295..8eb220b0879 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,2 +1 @@
-DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B 
a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd
 SHA512 
e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
 DIST nbdime-3.1.0.tar.gz 7508382 BLAKE2B 
10ca59684df06e922afbba30d5419a20490508af8bb9d4f371b1a06db49df7b665195c9aec21c3a303b3fa0c60e5c0c1e57badaba27ac81599b311f9a5000244
 SHA512 
be19fc058a918cd2aad38a8f727504a01c7830dfaba7fbf06caa0a6799770824499a70f4efe1ebf0a82847dc79d84896baf9aa86d3e7cd16dd7163023fed3855

diff --git a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch 
b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
deleted file mode 100644
index ff450f2ce44..000
--- a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
+++ /dev/null
@@ -1,36 +0,0 @@
 a/setupbase.py
-+++ b/setupbase.py
-@@ -129,17 +129,6 @@
- build_py.finalize_options()
- 
- 
--class bdist_egg_disabled(bdist_egg):
--"""Disabled version of bdist_egg
--
--Prevents setup.py install performing setuptools' default easy_install,
--which it should never ever do.
--"""
--def run(self):
--sys.exit("Aborting implicit building of eggs. Use `pip install .` "
-- " to install from source.")
--
--
- def create_cmdclass(prerelease_cmd=None, package_data_spec=None,
- data_files_spec=None):
- """Create a command class with the given optional prerelease class.
-@@ -179,14 +168,9 @@
- wrapper = functools.partial(_wrap_command, wrapped)
- handle_files = _get_file_handler(package_data_spec, data_files_spec)
- 
--if 'bdist_egg' in sys.argv:
--egg = wrapper(bdist_egg, strict=True)
--else:
--egg = bdist_egg_disabled
--
- cmdclass = dict(
- build_py=wrapper(build_py, strict=is_repo),
--bdist_egg=egg,
-+bdist_egg=wrapper(bdist_egg, strict=True),
- sdist=wrapper(sdist, strict=True),
- handle_files=handle_files,
- )

diff --git a/dev-python/nbdime/nbdime-2.0.0-r1.ebuild 
b/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
deleted file mode 100644
index 13f592127ee..000
--- a/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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/nbformat[${PYTHON_USEDEP}]
-   dev-python/notebook[${PYTHON_USEDEP}]
-   dev-python/pygments[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/six[${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/pytest-cov[${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 pytest
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.0-remove-bdist_egg-hack.patch )
-
-python_configure_all() {
-   use webtools || mydistutilsargs=( --skip-npm )
-}
-
-python_test() {
-   # user.email and user.name are not configured in the sandbox
-   git config --global user.email "y...@example.com" || die
-   git config --global user.name "Your Name" || die
-
-   distutils_install_for_testing
-   pytest -vv || die "Tests fail with ${EPYTHON}"
-}

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

2021-06-10 Thread Andrew Ammerlaan

commit: 70650f7d76ea8dd749b2427ff3a104e50cdc5bf3
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Jun 10 09:52:38 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jun 10 09:58:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70650f7d

dev-python/nbdime: add 3.1.0

Closes: https://bugs.gentoo.org/783243
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/nbdime/Manifest|  1 +
 dev-python/nbdime/nbdime-3.1.0.ebuild | 78 +++
 2 files changed, 79 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 5518da014d1..8c8d213e295 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,2 @@
 DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B 
a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd
 SHA512 
e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
+DIST nbdime-3.1.0.tar.gz 7508382 BLAKE2B 
10ca59684df06e922afbba30d5419a20490508af8bb9d4f371b1a06db49df7b665195c9aec21c3a303b3fa0c60e5c0c1e57badaba27ac81599b311f9a5000244
 SHA512 
be19fc058a918cd2aad38a8f727504a01c7830dfaba7fbf06caa0a6799770824499a70f4efe1ebf0a82847dc79d84896baf9aa86d3e7cd16dd7163023fed3855

diff --git a/dev-python/nbdime/nbdime-3.1.0.ebuild 
b/dev-python/nbdime/nbdime-3.1.0.ebuild
new file mode 100644
index 000..5a7c22168e0
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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 || mydistutilsargs=( --skip-npm )
+}
+
+src_test() {
+   # user.email and user.name are not configured in the sandbox
+   git config --global user.email "la...@gentoo.org" || die
+   git config --global user.name "Larry the Cow" || die
+   python_foreach_impl python_test
+}

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

2020-09-05 Thread Michał Górny

commit: 271ec27aa4638b76029fc94f1def2528b2a6f3b1
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Sep  5 07:22:02 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Sep  5 07:22:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271ec27a

dev-python/nbdime: Mark ALLARCHES

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index e11d50abc88..ac6865dc5c1 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -9,6 +9,7 @@
 jupyter/nbdime
 nbdime
   
+  
   
 
   Install web-based diff and merge tools.

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

2020-09-04 Thread Michał Górny

commit: 5143c727e9b903c9c6ba0e60e20ed31bdaee1e41
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Sep  5 06:00:10 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Sep  5 06:07:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5143c727

dev-python/nbdime: Revbump post py3.6 removal

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/{nbdime-2.0.0.ebuild => nbdime-2.0.0-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-python/nbdime/nbdime-2.0.0.ebuild 
b/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
similarity index 100%
rename from dev-python/nbdime/nbdime-2.0.0.ebuild
rename to dev-python/nbdime/nbdime-2.0.0-r1.ebuild

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

2020-09-02 Thread Michał Górny

commit: 744cfcc713c00a2c967a82dfc26a87c5720c2e3e
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Sep  2 08:40:52 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep  2 09:11:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=744cfcc7

dev-python/nbdime: Remove py3.6 due to ipython

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/nbdime-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/nbdime/nbdime-2.0.0.ebuild 
b/dev-python/nbdime/nbdime-2.0.0.ebuild
index 29db8fbcd28..13f592127ee 100644
--- a/dev-python/nbdime/nbdime-2.0.0.ebuild
+++ b/dev-python/nbdime/nbdime-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1

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

2020-09-02 Thread Michał Górny

commit: 753a6f9122541a37f709c2387644eb57f9071371
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Sep  2 08:46:11 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep  2 09:12:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=753a6f91

dev-python/nbdime: Remove redundant longdesc

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/nbdime/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index 9038be08ea0..e11d50abc88 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -5,9 +5,6 @@
 s...@gentoo.org
 Gentoo Science Project
   
-  
-nbdime provides tools for diffing and merging of Jupyter Notebooks.
-  
   
 jupyter/nbdime
 nbdime

[gentoo-commits] repo/gentoo:master commit in: dev-python/nbdime/, profiles/

2020-08-22 Thread David Seifert

commit: 7263ce6a990dcc3b73e403401cc84d092402d7e5
Author: David Seifert  gentoo  org>
AuthorDate: Sat Aug 22 18:37:22 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Aug 22 18:37:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7263ce6a

dev-python/nbdime: Remove old 0.2.0

Closes: https://bugs.gentoo.org/719106
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert  gentoo.org>

 dev-python/nbdime/Manifest|  1 -
 dev-python/nbdime/nbdime-0.2.0.ebuild | 67 ---
 profiles/package.mask |  1 -
 3 files changed, 69 deletions(-)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index ada1366ba87..5518da014d1 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,2 +1 @@
-DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 
1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be
 SHA512 
c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
 DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B 
a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd
 SHA512 
e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142

diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild 
b/dev-python/nbdime/nbdime-0.2.0.ebuild
deleted file mode 100644
index 63b92348ff5..000
--- a/dev-python/nbdime/nbdime-0.2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-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"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test webtools"
-RESTRICT="!test? ( test )"
-
-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}
-   doc? (
-   dev-python/recommonmark[${PYTHON_USEDEP}]
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-   )
-   test? (
-   dev-python/pytest[${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}]
-   )
-   "
-# 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_compile_all() {
-   if use doc; then
-   emake -C docs html
-   HTML_DOCS=( docs/build/html/. )
-   fi
-}
-
-python_test() {
-   # user.email and user.name are not configured in the sandbox.
-   git config --global user.email "y...@example.com" || die
-   git config --global user.name "Your Name" || die
-
-   distutils_install_for_testing
-
-   py.test -l || die
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 087d894e95f..f7e6a31af73 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -59,7 +59,6 @@ dev-python/ipynb
 dev-python/jira
 dev-python/jplephem
 dev-python/natgrid
-dev-python/nbdime
 dev-python/pcapy
 dev-python/promises
 dev-python/pycuda

[gentoo-commits] repo/gentoo:master commit in: dev-python/nbdime/, dev-python/nbdime/files/

2020-08-22 Thread David Seifert

commit: 556c851c4ee43e86e1121f2053a6b3f015c4f418
Author: David Seifert  gentoo  org>
AuthorDate: Sat Aug 22 18:37:19 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Aug 22 18:37:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=556c851c

dev-python/nbdime: Version bump to 2.0.0

Bug: https://bugs.gentoo.org/719106
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert  gentoo.org>

 dev-python/nbdime/Manifest |  1 +
 .../files/nbdime-2.0.0-remove-bdist_egg-hack.patch | 36 ++
 dev-python/nbdime/nbdime-2.0.0.ebuild  | 56 ++
 3 files changed, 93 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 4eb4ff20332..ada1366ba87 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,2 @@
 DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 
1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be
 SHA512 
c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
+DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B 
a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd
 SHA512 
e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142

diff --git a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch 
b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
new file mode 100644
index 000..ff450f2ce44
--- /dev/null
+++ b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
@@ -0,0 +1,36 @@
+--- a/setupbase.py
 b/setupbase.py
+@@ -129,17 +129,6 @@
+ build_py.finalize_options()
+ 
+ 
+-class bdist_egg_disabled(bdist_egg):
+-"""Disabled version of bdist_egg
+-
+-Prevents setup.py install performing setuptools' default easy_install,
+-which it should never ever do.
+-"""
+-def run(self):
+-sys.exit("Aborting implicit building of eggs. Use `pip install .` "
+- " to install from source.")
+-
+-
+ def create_cmdclass(prerelease_cmd=None, package_data_spec=None,
+ data_files_spec=None):
+ """Create a command class with the given optional prerelease class.
+@@ -179,14 +168,9 @@
+ wrapper = functools.partial(_wrap_command, wrapped)
+ handle_files = _get_file_handler(package_data_spec, data_files_spec)
+ 
+-if 'bdist_egg' in sys.argv:
+-egg = wrapper(bdist_egg, strict=True)
+-else:
+-egg = bdist_egg_disabled
+-
+ cmdclass = dict(
+ build_py=wrapper(build_py, strict=is_repo),
+-bdist_egg=egg,
++bdist_egg=wrapper(bdist_egg, strict=True),
+ sdist=wrapper(sdist, strict=True),
+ handle_files=handle_files,
+ )

diff --git a/dev-python/nbdime/nbdime-2.0.0.ebuild 
b/dev-python/nbdime/nbdime-2.0.0.ebuild
new file mode 100644
index 000..29db8fbcd28
--- /dev/null
+++ b/dev-python/nbdime/nbdime-2.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+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/nbformat[${PYTHON_USEDEP}]
+   dev-python/notebook[${PYTHON_USEDEP}]
+   dev-python/pygments[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/six[${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/pytest-cov[${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 pytest
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.0-remove-bdist_egg-hack.patch )
+
+python_configure_all() {
+   use webtools || mydistutilsargs=( --skip-npm )
+}
+
+python_test() {
+   # user.email and user.name are not configured in the sandbox
+   git config --global user.email "y...@example.com" || die
+   git config --global user.name "Your Name" || die
+
+   distutils_install_for_testing
+   pytest -vv || die "Tests fail with ${EPYTHON}"
+}

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

2019-12-13 Thread David Seifert

commit: 1f92ec4584bca3d28f6a9652dc26fc7fe1bceb8a
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec 13 20:44:51 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec 13 20:44:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f92ec45

dev-python/nbdime: Remove old

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 dev-python/nbdime/Manifest|  1 -
 dev-python/nbdime/nbdime-0.1.2.ebuild | 55 ---
 2 files changed, 56 deletions(-)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 30d1e1514f2..4eb4ff20332 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,2 +1 @@
-DIST nbdime-0.1.2.tar.gz 3864624 BLAKE2B 
dbf51b7eb07d08870fe1c629aa294b784fd95c0d547de3a4ea4fcf7da5ad6c490df3b61f3cb353723b3139137a54b534460c2a25a6480f7316b6fd17d742d661
 SHA512 
9f704645ef1e64b0da260841769068db6f6aba37f30b3c6506a1876af1276acb452ed78f66b9e6d7029f06ed9fabf01a1484b4b86055f27a451d623a7eda90cf
 DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 
1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be
 SHA512 
c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d

diff --git a/dev-python/nbdime/nbdime-0.1.2.ebuild 
b/dev-python/nbdime/nbdime-0.1.2.ebuild
deleted file mode 100644
index 0d4e32f604f..000
--- a/dev-python/nbdime/nbdime-0.1.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-
-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"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test webtools"
-RESTRICT="!test? ( test )"
-
-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/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}]
-   )
-   "
-# 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 "y...@example.com" || die
-   git config --global user.name "Your Name" || die
-
-   distutils_install_for_testing
-
-   py.test -l || die
-}

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

2019-03-10 Thread Patrice Clement

commit: e5766b7fe30bf3c89ffe7222ad340aaf46930c9f
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Mar  8 17:57:17 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Mar 10 22:35:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5766b7f

dev-python/nbdime: use HTTPS.

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11302
Signed-off-by: Patrice Clement  gentoo.org>

 dev-python/nbdime/nbdime-0.1.2.ebuild | 4 ++--
 dev-python/nbdime/nbdime-0.2.0.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-python/nbdime/nbdime-0.1.2.ebuild 
b/dev-python/nbdime/nbdime-0.1.2.ebuild
index f469ec14ebc..c50f45a761e 100644
--- a/dev-python/nbdime/nbdime-0.1.2.ebuild
+++ b/dev-python/nbdime/nbdime-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="http://jupyter.org";
+HOMEPAGE="https://jupyter.org";
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64"
 

diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild 
b/dev-python/nbdime/nbdime-0.2.0.ebuild
index d407d7d26d2..1304d390a05 100644
--- a/dev-python/nbdime/nbdime-0.2.0.ebuild
+++ b/dev-python/nbdime/nbdime-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="http://jupyter.org";
+HOMEPAGE="https://jupyter.org";
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64"

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

2018-06-24 Thread Pacho Ramos

commit: 0b5a13a502b9f1dadf8a1fd462aa7eb0ef8b3032
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun 24 15:10:52 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun 24 15:23:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5a13a5

dev-python/nbdime: Support python3.6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-python/nbdime/nbdime-0.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild 
b/dev-python/nbdime/nbdime-0.2.0.ebuild
index a5ed4d14c2a..d407d7d26d2 100644
--- a/dev-python/nbdime/nbdime-0.2.0.ebuild
+++ b/dev-python/nbdime/nbdime-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1

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

2017-03-09 Thread David Seifert

commit: 0b7f0a0b8a96e97da13fbc9970b2c08613edd5a5
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Wed Mar  8 08:52:25 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Mar  9 20:43:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7f0a0b

dev-python/nbdime: Version bump to 0.2.0 + add doc useflag

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4159

 dev-python/nbdime/Manifest|  1 +
 dev-python/nbdime/nbdime-0.2.0.ebuild | 66 +++
 2 files changed, 67 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 8c70c51b733..fe39dbaf96d 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,2 +1,3 @@
 DIST nbdime-0.1.0.tar.gz 3849944 SHA256 
5af53ccf5b265546e61fbc096c4dd8122855b2aa02f8b60a9901a8e33043 SHA512 
e110e2e3e8b9bfbaafd26e6558ec863eb0a23f3b7a67482e497c4883fa2151ae058582b975aca90392bd2314f5e32ce3e7316db9c2c37e44c336a9fcf88176c8
 WHIRLPOOL 
074060d867b259b461514e84b21c0f7eb20ff2f787055e03971fd18d0aa1ba56596b15017354c5becd3f1022b5557ec740d4815d4f820af8b54349273ee8b9a4
 DIST nbdime-0.1.2.tar.gz 3864624 SHA256 
4adb8ff052a7c778fb5f00872172a3790504de392eb7f23b6ae96b8a8165a695 SHA512 
9f704645ef1e64b0da260841769068db6f6aba37f30b3c6506a1876af1276acb452ed78f66b9e6d7029f06ed9fabf01a1484b4b86055f27a451d623a7eda90cf
 WHIRLPOOL 
570891b1f9067abe88009f7160f509f8cba6345742df3d0549a486b8669f84c097487d25855f76ddea3ee8d786131145467ea20bedf3d54bca30a137977b7978
+DIST nbdime-0.2.0.tar.gz 4139079 SHA256 
0915df792ab82fe8c3d3c892123bae0d5fb0180bafa150e2fe4dd327ff7e3c82 SHA512 
c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
 WHIRLPOOL 
0a95351be0efe993ffee5f677b62488deade3895400350c04f4743eae4bbb4e113f6fc2295ef777ecabdc9c3e27023c1d6dec4b83dc48c119ca95ea2417f9319

diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild 
b/dev-python/nbdime/nbdime-0.2.0.ebuild
new file mode 100644
index 000..a5ed4d14c2a
--- /dev/null
+++ b/dev-python/nbdime/nbdime-0.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="http://jupyter.org";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc 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}
+   doc? (
+   dev-python/recommonmark[${PYTHON_USEDEP}]
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+   )
+   test? (
+   dev-python/pytest[${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}]
+   )
+   "
+# 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_compile_all() {
+   if use doc; then
+   emake -C docs html
+   HTML_DOCS=( docs/build/html/. )
+   fi
+}
+
+python_test() {
+   # user.email and user.name are not configured in the sandbox.
+   git config --global user.email "y...@example.com" || die
+   git config --global user.name "Your Name" || die
+
+   distutils_install_for_testing
+
+   py.test -l || die
+}

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

2017-03-09 Thread David Seifert

commit: 641193e258f22e27fb2af065713a2be8977007a5
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Wed Mar  8 08:52:47 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Mar  9 20:43:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641193e2

dev-python/nbdime: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4159

 dev-python/nbdime/Manifest|  1 -
 dev-python/nbdime/nbdime-0.1.0.ebuild | 54 ---
 2 files changed, 55 deletions(-)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index fe39dbaf96d..3ac182565f0 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,3 +1,2 @@
-DIST nbdime-0.1.0.tar.gz 3849944 SHA256 
5af53ccf5b265546e61fbc096c4dd8122855b2aa02f8b60a9901a8e33043 SHA512 
e110e2e3e8b9bfbaafd26e6558ec863eb0a23f3b7a67482e497c4883fa2151ae058582b975aca90392bd2314f5e32ce3e7316db9c2c37e44c336a9fcf88176c8
 WHIRLPOOL 
074060d867b259b461514e84b21c0f7eb20ff2f787055e03971fd18d0aa1ba56596b15017354c5becd3f1022b5557ec740d4815d4f820af8b54349273ee8b9a4
 DIST nbdime-0.1.2.tar.gz 3864624 SHA256 
4adb8ff052a7c778fb5f00872172a3790504de392eb7f23b6ae96b8a8165a695 SHA512 
9f704645ef1e64b0da260841769068db6f6aba37f30b3c6506a1876af1276acb452ed78f66b9e6d7029f06ed9fabf01a1484b4b86055f27a451d623a7eda90cf
 WHIRLPOOL 
570891b1f9067abe88009f7160f509f8cba6345742df3d0549a486b8669f84c097487d25855f76ddea3ee8d786131145467ea20bedf3d54bca30a137977b7978
 DIST nbdime-0.2.0.tar.gz 4139079 SHA256 
0915df792ab82fe8c3d3c892123bae0d5fb0180bafa150e2fe4dd327ff7e3c82 SHA512 
c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
 WHIRLPOOL 
0a95351be0efe993ffee5f677b62488deade3895400350c04f4743eae4bbb4e113f6fc2295ef777ecabdc9c3e27023c1d6dec4b83dc48c119ca95ea2417f9319

diff --git a/dev-python/nbdime/nbdime-0.1.0.ebuild 
b/dev-python/nbdime/nbdime-0.1.0.ebuild
deleted file mode 100644
index f469ec14ebc..000
--- a/dev-python/nbdime/nbdime-0.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="http://jupyter.org";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-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/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}]
-   )
-   "
-# 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 "y...@example.com" || die
-   git config --global user.name "Your Name" || die
-
-   distutils_install_for_testing
-
-   py.test -l || die
-}

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

2017-02-04 Thread David Seifert

commit: f718efb3295eacf789be57b328125ecf0060d050
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Fri Feb  3 11:02:32 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb  4 21:28:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f718efb3

dev-python/nbdime: Version bump to 0.1.2

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3786

 dev-python/nbdime/Manifest|  1 +
 dev-python/nbdime/nbdime-0.1.2.ebuild | 55 +++
 2 files changed, 56 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 40dcd99..8c70c51 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,2 @@
 DIST nbdime-0.1.0.tar.gz 3849944 SHA256 
5af53ccf5b265546e61fbc096c4dd8122855b2aa02f8b60a9901a8e33043 SHA512 
e110e2e3e8b9bfbaafd26e6558ec863eb0a23f3b7a67482e497c4883fa2151ae058582b975aca90392bd2314f5e32ce3e7316db9c2c37e44c336a9fcf88176c8
 WHIRLPOOL 
074060d867b259b461514e84b21c0f7eb20ff2f787055e03971fd18d0aa1ba56596b15017354c5becd3f1022b5557ec740d4815d4f820af8b54349273ee8b9a4
+DIST nbdime-0.1.2.tar.gz 3864624 SHA256 
4adb8ff052a7c778fb5f00872172a3790504de392eb7f23b6ae96b8a8165a695 SHA512 
9f704645ef1e64b0da260841769068db6f6aba37f30b3c6506a1876af1276acb452ed78f66b9e6d7029f06ed9fabf01a1484b4b86055f27a451d623a7eda90cf
 WHIRLPOOL 
570891b1f9067abe88009f7160f509f8cba6345742df3d0549a486b8669f84c097487d25855f76ddea3ee8d786131145467ea20bedf3d54bca30a137977b7978

diff --git a/dev-python/nbdime/nbdime-0.1.2.ebuild 
b/dev-python/nbdime/nbdime-0.1.2.ebuild
new file mode 100644
index ..718527d
--- /dev/null
+++ b/dev-python/nbdime/nbdime-0.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="http://jupyter.org";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+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/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}]
+   )
+   "
+# 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 "y...@example.com" || die
+   git config --global user.name "Your Name" || die
+
+   distutils_install_for_testing
+
+   py.test -l || die
+}

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

2017-01-02 Thread Justin Lecher

commit: f9daab8b0dff06d345f733e8d5550c7d3853b1c8
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Mon Jan  2 11:04:12 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jan  2 22:09:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9daab8b

dev-python/nbdime: New package.

nbdime provides tools for diffing and merging of Jupyter Notebooks.
Beside console based diffing and merging tools, web-based diffing
and merging tools are provided (requiring npm).

The ebuild is based on the live ebuild in the science overlay,
https://github.com/gentoo-science/sci, which was added by me to
the overlay.

Gentoo-Bug: https://bugs.gentoo.org/604372

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3301

 dev-python/nbdime/Manifest|  1 +
 dev-python/nbdime/metadata.xml| 24 +++
 dev-python/nbdime/nbdime-0.1.0.ebuild | 55 +++
 3 files changed, 80 insertions(+)

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
new file mode 100644
index ..40dcd99
--- /dev/null
+++ b/dev-python/nbdime/Manifest
@@ -0,0 +1 @@
+DIST nbdime-0.1.0.tar.gz 3849944 SHA256 
5af53ccf5b265546e61fbc096c4dd8122855b2aa02f8b60a9901a8e33043 SHA512 
e110e2e3e8b9bfbaafd26e6558ec863eb0a23f3b7a67482e497c4883fa2151ae058582b975aca90392bd2314f5e32ce3e7316db9c2c37e44c336a9fcf88176c8
 WHIRLPOOL 
074060d867b259b461514e84b21c0f7eb20ff2f787055e03971fd18d0aa1ba56596b15017354c5becd3f1022b5557ec740d4815d4f820af8b54349273ee8b9a4

diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
new file mode 100644
index ..b2a229d
--- /dev/null
+++ b/dev-python/nbdime/metadata.xml
@@ -0,0 +1,24 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+  
+mar...@linux.sungazer.de
+Marius Brehler
+  
+  
+s...@gentoo.org
+Gentoo Science Project
+  
+  
+nbdime provides tools for diffing and merging of Jupyter Notebooks.
+  
+  
+jupyter/nbdime
+nbdime
+  
+  
+
+  Install web-based diff and merge tools.
+
+
+

diff --git a/dev-python/nbdime/nbdime-0.1.0.ebuild 
b/dev-python/nbdime/nbdime-0.1.0.ebuild
new file mode 100644
index ..718527d
--- /dev/null
+++ b/dev-python/nbdime/nbdime-0.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="http://jupyter.org";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+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/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}]
+   )
+   "
+# 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 "y...@example.com" || die
+   git config --global user.name "Your Name" || die
+
+   distutils_install_for_testing
+
+   py.test -l || die
+}

51 matches

Mail list logo