[gentoo-commits] repo/gentoo:master commit in: dev-python/ipyparallel/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     ed80f857532c9ab3650c6aca6c03507d487d38e0
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 22:33:37 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 22:33:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed80f857

dev-python/ipyparallel:  add conditional block on ipython-6 for python-2.7

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 dev-python/ipyparallel/ipyparallel-4.1.0.ebuild      |  3 ++-
 dev-python/ipyparallel/ipyparallel-5.0.1.ebuild      |  3 ++-
 dev-python/ipyparallel/ipyparallel-5.1.1.ebuild      |  3 ++-
 dev-python/ipyparallel/ipyparallel-5.2.0.ebuild      |  3 ++-
 ...llel-6.0.2.ebuild => ipyparallel-6.0.2-r1.ebuild} | 20 +++++++++++---------
 dev-python/ipyparallel/ipyparallel-6.0.2.ebuild      |  1 +
 dev-python/ipyparallel/metadata.xml                  |  2 +-
 7 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild b/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
index 94b1c39303f..62d09048ca0 100644
--- a/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	!<dev-python/ipython-4.0.0[smp]
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}

diff --git a/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
index 3703b40eb6e..d7477fdddfa 100644
--- a/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	!<dev-python/ipython-4.0.0[smp]
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}

diff --git a/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild b/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild
index 6012661d73f..459d8e5dc1b 100644
--- a/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	!<dev-python/ipython-4.0.0[smp]
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
 	dev-python/notebook[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]

diff --git a/dev-python/ipyparallel/ipyparallel-5.2.0.ebuild b/dev-python/ipyparallel/ipyparallel-5.2.0.ebuild
index 5dd5e10510c..41ea11d938a 100644
--- a/dev-python/ipyparallel/ipyparallel-5.2.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	!<dev-python/ipython-4.0.0[smp]
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
 	dev-python/notebook[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]

diff --git a/dev-python/ipyparallel/ipyparallel-6.0.2.ebuild b/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
similarity index 79%
copy from dev-python/ipyparallel/ipyparallel-6.0.2.ebuild
copy to dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
index 3f686896a64..5b18b53468d 100644
--- a/dev-python/ipyparallel/ipyparallel-6.0.2.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
@@ -9,33 +9,35 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Interactive Parallel Computing with IPython"
-HOMEPAGE="http://ipython.org/"
+HOMEPAGE="https://ipyparallel.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
-	!<dev-python/ipython-4.0.0[smp]
+	!<dev-python/ipython-4.0.0[smp,${PYTHON_USEDEP}]
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
-	dev-python/notebook[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2*')
+	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	"

diff --git a/dev-python/ipyparallel/ipyparallel-6.0.2.ebuild b/dev-python/ipyparallel/ipyparallel-6.0.2.ebuild
index 3f686896a64..646d41f5422 100644
--- a/dev-python/ipyparallel/ipyparallel-6.0.2.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.0.2.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	!<dev-python/ipython-4.0.0[smp]
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
 	dev-python/notebook[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]

diff --git a/dev-python/ipyparallel/metadata.xml b/dev-python/ipyparallel/metadata.xml
index f58431f0f4b..742b296901f 100644
--- a/dev-python/ipyparallel/metadata.xml
+++ b/dev-python/ipyparallel/metadata.xml
@@ -6,7 +6,7 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription>
-  	Interactive Parallel Computing with IPython.
+    Interactive Parallel Computing with IPython.
     ipyparallel is the new home of IPython.parallel.
   </longdescription>
   <upstream>