commit: 1f913035f1f2b830c58c1652db63151db355b8ec Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> AuthorDate: Fri May 3 12:51:12 2019 +0000 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> CommitDate: Fri May 3 12:53:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f913035
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 <AT> gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild | 3 +-- dev-python/ipykernel/ipykernel-4.8.2.ebuild | 3 +-- dev-python/ipykernel/ipykernel-5.1.0.ebuild | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild index f9dcdf2e366..e3f9e55a1ce 100644 --- 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 4c4883c4821..200a48df554 100644 --- 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 c796b2e5793..cf43e216a89 100644 --- 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}]
