From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1087459-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 96BAD138334
for <garchives@archives.gentoo.org>; Fri, 3 May 2019 12:54:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9B043E091F;
Fri, 3 May 2019 12:54:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6EA80E091F
for <gentoo-commits@lists.gentoo.org>; Fri, 3 May 2019 12:54:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AAE5C3433DD
for <gentoo-commits@lists.gentoo.org>; Fri, 3 May 2019 12:54:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A26C567
for <gentoo-commits@lists.gentoo.org>; Fri, 3 May 2019 12:53:59 +0000 (UTC)
From: "Virgil Dupras" <vdupras@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Virgil Dupras" <vdupras@gentoo.org>
Message-ID: <1556888020.1f913035f1f2b830c58c1652db63151db355b8ec.vdupras@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/ipykernel/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild dev-python/ipykernel/ipykernel-4.8.2.ebuild dev-python/ipykernel/ipykernel-5.1.0.ebuild
X-VCS-Directories: dev-python/ipykernel/
X-VCS-Committer: vdupras
X-VCS-Committer-Name: Virgil Dupras
X-VCS-Revision: 1f913035f1f2b830c58c1652db63151db355b8ec
X-VCS-Branch: master
Date: Fri, 3 May 2019 12:53:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 026203e1-54aa-48ed-a3ab-4609de632ad1
X-Archives-Hash: 084ec192d5fbce1ef10cb4b7b1f24887
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}]