1 |
commit: 0438d76575de86cf88d45a0264214afa87781b53 |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 30 08:59:02 2017 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 30 08:59:02 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0438d765 |
7 |
|
8 |
dev-python/ipykernel: specify python major version in kernelspec |
9 |
|
10 |
Revision bump and remove old revisions. |
11 |
|
12 |
Credit: Eric Hermes |
13 |
Bug: 628222 |
14 |
|
15 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
16 |
|
17 |
...l-4.6.1-r1.ebuild => ipykernel-4.6.1-r2.ebuild} | 8 +++++ |
18 |
dev-python/ipykernel/ipykernel-4.6.1.ebuild | 36 ---------------------- |
19 |
2 files changed, 8 insertions(+), 36 deletions(-) |
20 |
|
21 |
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild |
22 |
similarity index 82% |
23 |
rename from dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild |
24 |
rename to dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild |
25 |
index ec1018dbdab..01461f09931 100644 |
26 |
--- a/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild |
27 |
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild |
28 |
@@ -32,6 +32,14 @@ DEPEND="${RDEPEND} |
29 |
) |
30 |
" |
31 |
|
32 |
+python_install() { |
33 |
+ distutils-r1_python_install |
34 |
+ |
35 |
+ # bug 628222, specify python 2 or 3. |
36 |
+ sed -e "s:python:${EPYTHON}:" \ |
37 |
+ -i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die |
38 |
+} |
39 |
+ |
40 |
python_test() { |
41 |
nosetests --verbose ipykernel || die |
42 |
} |
43 |
|
44 |
diff --git a/dev-python/ipykernel/ipykernel-4.6.1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1.ebuild |
45 |
deleted file mode 100644 |
46 |
index fc775127657..00000000000 |
47 |
--- a/dev-python/ipykernel/ipykernel-4.6.1.ebuild |
48 |
+++ /dev/null |
49 |
@@ -1,36 +0,0 @@ |
50 |
-# Copyright 1999-2017 Gentoo Foundation |
51 |
-# Distributed under the terms of the GNU General Public License v2 |
52 |
- |
53 |
-EAPI=6 |
54 |
- |
55 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
56 |
-PYTHON_REQ_USE="threads(+)" |
57 |
- |
58 |
-inherit distutils-r1 |
59 |
- |
60 |
-DESCRIPTION="IPython Kernel for Jupyter" |
61 |
-HOMEPAGE="https://github.com/ipython/ipykernel" |
62 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
63 |
- |
64 |
-LICENSE="BSD" |
65 |
-SLOT="0" |
66 |
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" |
67 |
-IUSE="test" |
68 |
- |
69 |
-RDEPEND=" |
70 |
- >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] |
71 |
- $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') |
72 |
- dev-python/jupyter_client[${PYTHON_USEDEP}] |
73 |
- >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}] |
74 |
- >=www-servers/tornado-4.0[${PYTHON_USEDEP}] |
75 |
-" |
76 |
-DEPEND="${RDEPEND} |
77 |
- test? ( |
78 |
- dev-python/nose[${PYTHON_USEDEP}] |
79 |
- dev-python/nose_warnings_filters[${PYTHON_USEDEP}] |
80 |
- ) |
81 |
- " |
82 |
- |
83 |
-python_test() { |
84 |
- nosetests --verbose ipykernel || die |
85 |
-} |