| 1 |
commit: 1f913035f1f2b830c58c1652db63151db355b8ec |
| 2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 3 12:51:12 2019 +0000 |
| 4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 3 12:53:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f913035 |
| 7 |
|
| 8 |
dev-python/ipykernel: adjust dependencies on ipython |
| 9 |
|
| 10 |
With ipython6+ dropping py2 and ipython having a circular dependency |
| 11 |
with ipykernel and ipyparallel, things get messy and portage's error |
| 12 |
messages are unhelpful unless we have a clean break in our dependencies. |
| 13 |
|
| 14 |
With this commit, all <ipykernel-5 depend on <ipython-6 and all |
| 15 |
>=ipykernel-5 depend on >=ipython-6. This makes portage's dependency |
| 16 |
resolution much happier and results in helpful error messages indicating |
| 17 |
what packages need "-python_targets_python2_7". |
| 18 |
|
| 19 |
Bug: https://bugs.gentoo.org/684962 |
| 20 |
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> |
| 21 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 22 |
|
| 23 |
dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild | 3 +-- |
| 24 |
dev-python/ipykernel/ipykernel-4.8.2.ebuild | 3 +-- |
| 25 |
dev-python/ipykernel/ipykernel-5.1.0.ebuild | 3 +-- |
| 26 |
3 files changed, 3 insertions(+), 6 deletions(-) |
| 27 |
|
| 28 |
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild |
| 29 |
index f9dcdf2e366..e3f9e55a1ce 100644 |
| 30 |
--- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild |
| 31 |
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild |
| 32 |
@@ -18,8 +18,7 @@ KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" |
| 33 |
IUSE="test" |
| 34 |
|
| 35 |
RDEPEND=" |
| 36 |
- >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] |
| 37 |
- $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') |
| 38 |
+ <dev-python/ipython-6[${PYTHON_USEDEP}] |
| 39 |
dev-python/jupyter_client[${PYTHON_USEDEP}] |
| 40 |
>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}] |
| 41 |
>=www-servers/tornado-4.0[${PYTHON_USEDEP}] |
| 42 |
|
| 43 |
diff --git a/dev-python/ipykernel/ipykernel-4.8.2.ebuild b/dev-python/ipykernel/ipykernel-4.8.2.ebuild |
| 44 |
index 4c4883c4821..200a48df554 100644 |
| 45 |
--- a/dev-python/ipykernel/ipykernel-4.8.2.ebuild |
| 46 |
+++ b/dev-python/ipykernel/ipykernel-4.8.2.ebuild |
| 47 |
@@ -18,8 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" |
| 48 |
IUSE="test" |
| 49 |
|
| 50 |
RDEPEND=" |
| 51 |
- >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] |
| 52 |
- $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') |
| 53 |
+ <dev-python/ipython-6[${PYTHON_USEDEP}] |
| 54 |
dev-python/jupyter_client[${PYTHON_USEDEP}] |
| 55 |
>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}] |
| 56 |
>=www-servers/tornado-4.0[${PYTHON_USEDEP}] |
| 57 |
|
| 58 |
diff --git a/dev-python/ipykernel/ipykernel-5.1.0.ebuild b/dev-python/ipykernel/ipykernel-5.1.0.ebuild |
| 59 |
index c796b2e5793..cf43e216a89 100644 |
| 60 |
--- a/dev-python/ipykernel/ipykernel-5.1.0.ebuild |
| 61 |
+++ b/dev-python/ipykernel/ipykernel-5.1.0.ebuild |
| 62 |
@@ -18,8 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" |
| 63 |
IUSE="test" |
| 64 |
|
| 65 |
RDEPEND=" |
| 66 |
- >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}] |
| 67 |
- $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*') |
| 68 |
+ >=dev-python/ipython-6[${PYTHON_USEDEP}] |
| 69 |
dev-python/jupyter_client[${PYTHON_USEDEP}] |
| 70 |
>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}] |
| 71 |
>=www-servers/tornado-4.0[${PYTHON_USEDEP}] |
Archives