dev-python/ipykernel: adjust dependencies on ipython

With ipython6+ dropping py2 and ipython having a circular dependency
with ipykernel and ipyparallel, things get messy and portage's error
messages are unhelpful unless we have a clean break in our dependencies.

With this commit, all <ipykernel-5 depend on <ipython-6 and all
>=ipykernel-5 depend on >=ipython-6. This makes portage's dependency
resolution much happier and results in helpful error messages indicating
what packages need "-python_targets_python2_7".

Bug: https://bugs.gentoo.org/684962
Signed-off-by: Virgil Dupras <vdupras@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
index f9dcdf2e36669c58484ab7c2ddabdf70784ac399..e3f9e55a1ce3886c7e5cbc37a52daeef129743f6 100644 (file)
--- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
@@ -18,8 +18,7 @@ KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-       >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+       <dev-python/ipython-6[${PYTHON_USEDEP}]
        dev-python/jupyter_client[${PYTHON_USEDEP}]
        >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
        >=www-servers/tornado-4.0[${PYTHON_USEDEP}]

diff --git a/dev-python/ipykernel/ipykernel-4.8.2.ebuild b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
index 4c4883c482169bc06d7a1a204ff3c7734b2059ff..200a48df55444178fd7988a902b780c723c29241 100644 (file)
--- a/dev-python/ipykernel/ipykernel-4.8.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.8.2.ebuild
@@ -18,8 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-       >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+       <dev-python/ipython-6[${PYTHON_USEDEP}]
        dev-python/jupyter_client[${PYTHON_USEDEP}]
        >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
        >=www-servers/tornado-4.0[${PYTHON_USEDEP}]

diff --git a/dev-python/ipykernel/ipykernel-5.1.0.ebuild b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
index c796b2e579314136643c88445cf486fd555effb6..cf43e216a89b1bd0a0ceebb1d5e9164d83103203 100644 (file)
--- a/dev-python/ipykernel/ipykernel-5.1.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
@@ -18,8 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
-       >=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+       >=dev-python/ipython-6[${PYTHON_USEDEP}]
        dev-python/jupyter_client[${PYTHON_USEDEP}]
        >=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
        >=www-servers/tornado-4.0[${PYTHON_USEDEP}]