diff options
| author |   Virgil Dupras <vdupras@gentoo.org> | 2019-05-03 08:51:12 -0400 |
|---|---|---|
| committer | Virgil Dupras <vdupras@gentoo.org> | 2019-05-03 08:53:40 -0400 |
| commit | 1f913035f1f2b830c58c1652db63151db355b8ec (patch) | |
| tree | 8794f49515b49b21745b8a028700dbec9e038d7d /dev-python/ipykernel | |
| parent | profiles: mask >=dev-python/ipykernel-5 (diff) | |
| download | gentoo-1f913035f1f2b830c58c1652db63151db355b8ec.tar.gz gentoo-1f913035f1f2b830c58c1652db63151db355b8ec.tar.bz2 gentoo-1f913035f1f2b830c58c1652db63151db355b8ec.zip | |
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
Diffstat (limited to 'dev-python/ipykernel')
| -rw-r--r-- | dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild | 3 | ||||
| -rw-r--r-- | dev-python/ipykernel/ipykernel-4.8.2.ebuild | 3 | ||||
| -rw-r--r-- | 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 f9dcdf2e3666..e3f9e55a1ce3 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 4c4883c48216..200a48df5544 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 c796b2e57931..cf43e216a89b 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}] |