Skip to content

Commit

Permalink
dev-python/ipykernel: adjust dependencies on ipython
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
  • Loading branch information
Virgil Dupras committed May 3, 2019
1 parent 2d6a83b commit 1f91303
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}]
Expand Down
3 changes: 1 addition & 2 deletions dev-python/ipykernel/ipykernel-4.8.2.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}]
Expand Down
3 changes: 1 addition & 2 deletions dev-python/ipykernel/ipykernel-5.1.0.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}]
Expand Down

0 comments on commit 1f91303

Please sign in to comment.