Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/nbdime/, dev-python/nbdime/files/
Date: Sun, 17 Oct 2021 09:07:25
Message-Id: 1634461497.0374a8ddfabf84681abac96e264a1a420a0269f8.mgorny@gentoo
1 commit: 0374a8ddfabf84681abac96e264a1a420a0269f8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 17 09:04:57 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 17 09:04:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0374a8dd
7
8 dev-python/nbdime: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/nbdime/Manifest | 1 -
13 .../files/nbdime-2.0.0-remove-bdist_egg-hack.patch | 36 --------------
14 dev-python/nbdime/nbdime-2.0.0-r1.ebuild | 56 ----------------------
15 3 files changed, 93 deletions(-)
16
17 diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
18 index 8c8d213e295..8eb220b0879 100644
19 --- a/dev-python/nbdime/Manifest
20 +++ b/dev-python/nbdime/Manifest
21 @@ -1,2 +1 @@
22 -DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
23 DIST nbdime-3.1.0.tar.gz 7508382 BLAKE2B 10ca59684df06e922afbba30d5419a20490508af8bb9d4f371b1a06db49df7b665195c9aec21c3a303b3fa0c60e5c0c1e57badaba27ac81599b311f9a5000244 SHA512 be19fc058a918cd2aad38a8f727504a01c7830dfaba7fbf06caa0a6799770824499a70f4efe1ebf0a82847dc79d84896baf9aa86d3e7cd16dd7163023fed3855
24
25 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
26 deleted file mode 100644
27 index ff450f2ce44..00000000000
28 --- a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
29 +++ /dev/null
30 @@ -1,36 +0,0 @@
31 ---- a/setupbase.py
32 -+++ b/setupbase.py
33 -@@ -129,17 +129,6 @@
34 - build_py.finalize_options()
35 -
36 -
37 --class bdist_egg_disabled(bdist_egg):
38 -- """Disabled version of bdist_egg
39 --
40 -- Prevents setup.py install performing setuptools' default easy_install,
41 -- which it should never ever do.
42 -- """
43 -- def run(self):
44 -- sys.exit("Aborting implicit building of eggs. Use `pip install .` "
45 -- " to install from source.")
46 --
47 --
48 - def create_cmdclass(prerelease_cmd=None, package_data_spec=None,
49 - data_files_spec=None):
50 - """Create a command class with the given optional prerelease class.
51 -@@ -179,14 +168,9 @@
52 - wrapper = functools.partial(_wrap_command, wrapped)
53 - handle_files = _get_file_handler(package_data_spec, data_files_spec)
54 -
55 -- if 'bdist_egg' in sys.argv:
56 -- egg = wrapper(bdist_egg, strict=True)
57 -- else:
58 -- egg = bdist_egg_disabled
59 --
60 - cmdclass = dict(
61 - build_py=wrapper(build_py, strict=is_repo),
62 -- bdist_egg=egg,
63 -+ bdist_egg=wrapper(bdist_egg, strict=True),
64 - sdist=wrapper(sdist, strict=True),
65 - handle_files=handle_files,
66 - )
67
68 diff --git a/dev-python/nbdime/nbdime-2.0.0-r1.ebuild b/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
69 deleted file mode 100644
70 index 13f592127ee..00000000000
71 --- a/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
72 +++ /dev/null
73 @@ -1,56 +0,0 @@
74 -# Copyright 1999-2020 Gentoo Authors
75 -# Distributed under the terms of the GNU General Public License v2
76 -
77 -EAPI=7
78 -
79 -PYTHON_COMPAT=( python3_{7..9} )
80 -
81 -inherit distutils-r1
82 -
83 -DESCRIPTION="Diff and merge of Jupyter Notebooks"
84 -HOMEPAGE="https://jupyter.org"
85 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
86 -
87 -LICENSE="BSD"
88 -SLOT="0"
89 -KEYWORDS="~amd64"
90 -IUSE="webtools"
91 -
92 -RDEPEND="
93 - dev-python/colorama[${PYTHON_USEDEP}]
94 - dev-python/GitPython[${PYTHON_USEDEP}]
95 - dev-python/jinja[${PYTHON_USEDEP}]
96 - dev-python/nbformat[${PYTHON_USEDEP}]
97 - dev-python/notebook[${PYTHON_USEDEP}]
98 - dev-python/pygments[${PYTHON_USEDEP}]
99 - dev-python/requests[${PYTHON_USEDEP}]
100 - dev-python/six[${PYTHON_USEDEP}]
101 - www-servers/tornado[${PYTHON_USEDEP}]
102 - webtools? ( net-libs/nodejs[npm] )"
103 -BDEPEND="
104 - test? (
105 - dev-python/jsonschema[${PYTHON_USEDEP}]
106 - dev-python/mock[${PYTHON_USEDEP}]
107 - dev-python/pytest-cov[${PYTHON_USEDEP}]
108 - dev-python/pytest-timeout[${PYTHON_USEDEP}]
109 - dev-python/tabulate[${PYTHON_USEDEP}]
110 - )"
111 -
112 -distutils_enable_sphinx docs/source \
113 - dev-python/recommonmark dev-python/sphinx_rtd_theme
114 -distutils_enable_tests pytest
115 -
116 -PATCHES=( "${FILESDIR}"/${PN}-2.0.0-remove-bdist_egg-hack.patch )
117 -
118 -python_configure_all() {
119 - use webtools || mydistutilsargs=( --skip-npm )
120 -}
121 -
122 -python_test() {
123 - # user.email and user.name are not configured in the sandbox
124 - git config --global user.email "you@×××××××.com" || die
125 - git config --global user.name "Your Name" || die
126 -
127 - distutils_install_for_testing
128 - pytest -vv || die "Tests fail with ${EPYTHON}"
129 -}