[gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/files/, dev-python/ipython/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/files/, dev-python/ipython/
@ 2017-05-03  7:37 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2017-05-03  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     838238edaf0d071c95f1b01ae5d706a81253a060
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 06:40:25 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May  3 07:37:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838238ed

dev-python/ipython: Clean old versions up

 dev-python/ipython/Manifest                        |   5 -
 ....2.0-only-use-backports-shutil-on-python2.patch |  40 ------
 dev-python/ipython/ipython-4.0.3.ebuild            | 136 -------------------
 dev-python/ipython/ipython-4.1.2.ebuild            | 140 --------------------
 dev-python/ipython/ipython-4.2.0-r1.ebuild         | 144 ---------------------
 dev-python/ipython/ipython-5.1.0-r1.ebuild         | 139 --------------------
 dev-python/ipython/ipython-5.2.2.ebuild            | 138 --------------------
 7 files changed, 742 deletions(-)

diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 442ef9e5583..6dd80614e55 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,7 +1,2 @@
 DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1
-DIST ipython-4.0.3.tar.gz 6207899 SHA256 3a928f59e8ac8dd97858c28390867c87c09510f1f8bbe97e4e9c6b036eb84fc0 SHA512 1e2deb597348757e69aaeadd0632cf984056e5f7278ee5bbbd7b4233581323b07f55685b1891c23dc0977d9f30f7dc734dcf2216bc8876424cdb0f7a9294fecf WHIRLPOOL 1beb60e6daf3cea4609318e87a07307843eeb1002847f8c3c5fbe8e114ab29cb052c810884b410f1e8414437b91c5335048106756e2d88a82a7e440e3ff8fc17
-DIST ipython-4.1.2.tar.gz 4953949 SHA256 052f9692a227f285febecec856d749811ac6a20b32c7629b4de31f04ea701692 SHA512 2a28a82cbc5d11cb1f1c88e452f52dbc6b196ac12d46cdec1f35d49e7f97aa8ee5c2a90a6f02f072297c4ef17f84a4454100a4b2594968ec46995c4fd459c09b WHIRLPOOL 1ae1fb4a88d9fd73c93ce096cdb4754d3153e156d87760b48825a2af3ec7eec3d3232b2b0f59f5fce94fb4e14b8c51361781527d9f5320a336ed786fc339567f
-DIST ipython-4.2.0.tar.gz 4935042 SHA256 dba42f182b5f6f26630d2202efd30383712d9f7d8d8d9896b37ae2145deca616 SHA512 01c931a9745af7d43d174b761b506b78840ac9484007741665ff3d4a448131384194869552957353d07beb35e29187743353002c7c0a31f3b336f3b01a64a323 WHIRLPOOL 62468bef537d7533eaf9c89106bd7587dae70c921d623374c0ea796262e304cbf53020375c1876ebefb8b42e7d896b8b071afbcd5e1c710dac4a0a00783f3d82
-DIST ipython-5.1.0.tar.gz 4945490 SHA256 7ef4694e1345913182126b219aaa4a0047e191af414256da6772cf249571b961 SHA512 84dbb5629d7a781abdadb9015dc637551bd57427d3187a55de3fb7f50d3d36afb1a8c0a5aaf75da95a8ff41ab623a3c6216373b2145914b960983ba0bf52c3c2 WHIRLPOOL 298e5c248a9d56ec3d9d9824ecee67da95c48d664a44643b8eede8e1719c7d6566b8dcc1fbf8cd4ae8f2829218ad189e9415fb931151b71402a40f326ca9cf01
-DIST ipython-5.2.2.tar.gz 4948601 SHA256 6ee1c89f6031e0c86727820ad394c6eb4d3ac28de48e0df3b9367ccf92e212e2 SHA512 ca4663adca98ce6e1a7e6d3a4e7050e64e73ab2ffeb49ad35322f002ee88fdb9db68ecd591cbadaf00d47df22890f70042d8671affed1a86dd24e609667c6d5c WHIRLPOOL ab6fb9b362b3697884df0c1d5208253fe8e341f6cce552bd4d74268f8fe76d0355ba7749d9f7defad641eafce2db0d35000850b4bb796aa4a2024564ddcaa472
 DIST ipython-5.3.0.tar.gz 4967956 SHA256 bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d SHA512 41706d7521cc84f36f5580dc44cd91832a60aa8a7a946d15a9ec9563649b9ae97931b9f135f1fdbaecbcb0b9b925d467edfd6eec7f8c82309872047be77b598d WHIRLPOOL 96478b15fd4928d11da35dbbaba6492ff12cf739c06b6f9cf8fdd827060baf5c07d093c3e340792b62102f85ada0b6ea29adc742b784ad21e5292cde09a6fa25

diff --git a/dev-python/ipython/files/ipython-4.2.0-only-use-backports-shutil-on-python2.patch b/dev-python/ipython/files/ipython-4.2.0-only-use-backports-shutil-on-python2.patch
deleted file mode 100644
index ba17f0fbcad..00000000000
--- a/dev-python/ipython/files/ipython-4.2.0-only-use-backports-shutil-on-python2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/IPython/utils/terminal.py b/IPython/utils/terminal.py
-index 9e7be2a..a1f0f73 100644
---- a/IPython/utils/terminal.py
-+++ b/IPython/utils/terminal.py
-@@ -9,22 +9,18 @@
- * Alexander Belchenko (e-mail: bialix AT ukr.net)
- """
- 
--#-----------------------------------------------------------------------------
--#  Copyright (C) 2008-2011  The IPython Development Team
--#
--#  Distributed under the terms of the BSD License.  The full license is in
--#  the file COPYING, distributed as part of this software.
--#-----------------------------------------------------------------------------
--
--#-----------------------------------------------------------------------------
--# Imports
--#-----------------------------------------------------------------------------
-+# Copyright (c) IPython Development Team.
-+# Distributed under the terms of the Modified BSD License.
- 
- import os
- import struct
- import sys
- import warnings
--import backports.shutil_get_terminal_size
-+try:
-+    from shutil import get_terminal_size as _get_terminal_size
-+except ImportError:
-+    # use backport on Python 2
-+    from backports.shutil_get_terminal_size import get_terminal_size as _get_terminal_size
- 
- from . import py3compat
- 
-@@ -122,4 +118,4 @@ def freeze_term_title():
- 
- 
- def get_terminal_size(defaultx=80, defaulty=25):
--    return backports.shutil_get_terminal_size.get_terminal_size((defaultx, defaulty))
-+    return _get_terminal_size((defaultx, defaulty))

diff --git a/dev-python/ipython/ipython-4.0.3.ebuild b/dev-python/ipython/ipython-4.0.3.ebuild
deleted file mode 100644
index 51809b1b3b1..00000000000
--- a/dev-python/ipython/ipython-4.0.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-
-RDEPEND="${CDEPEND}
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
-	qt4? ( dev-python/qtconsole )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-	# https://github.com/ipython/ipython/issues/8639
-	# Failure of some modules only in python3.4
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null || die
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null || die
-	}
-	VIRTUALX_COMMAND=run_tests virtualmake
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}

diff --git a/dev-python/ipython/ipython-4.1.2.ebuild b/dev-python/ipython/ipython-4.1.2.ebuild
deleted file mode 100644
index eeaad84ca9e..00000000000
--- a/dev-python/ipython/ipython-4.1.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-
-RDEPEND="${CDEPEND}
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	qt4? ( dev-python/qtconsole )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-	# https://github.com/ipython/ipython/issues/8639
-	# Failure of some modules only in python3.4
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null || die
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null || die
-	}
-	virtx run_tests
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}

diff --git a/dev-python/ipython/ipython-4.2.0-r1.ebuild b/dev-python/ipython/ipython-4.2.0-r1.ebuild
deleted file mode 100644
index a6dd416aee8..00000000000
--- a/dev-python/ipython/ipython-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-
-RDEPEND="${CDEPEND}
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	qt4? ( dev-python/qtconsole )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	"${FILESDIR}/${P}-only-use-backports-shutil-on-python2.patch"
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-	# https://github.com/ipython/ipython/issues/8639
-	# Failure of some modules only in python3.4
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null || die
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null || die
-	}
-	virtx run_tests
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}

diff --git a/dev-python/ipython/ipython-5.1.0-r1.ebuild b/dev-python/ipython/ipython-5.1.0-r1.ebuild
deleted file mode 100644
index 26ba50bb202..00000000000
--- a/dev-python/ipython/ipython-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.3[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-
-RDEPEND="${CDEPEND}
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	qt4? ( dev-python/qtconsole )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd ${TEST_DIR} > /dev/null || die
-	"${PYTHON}" -m IPython.testing.iptestcontroller --all || die
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}

diff --git a/dev-python/ipython/ipython-5.2.2.ebuild b/dev-python/ipython/ipython-5.2.2.ebuild
deleted file mode 100644
index 426232e4cfc..00000000000
--- a/dev-python/ipython/ipython-5.2.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.3[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' 'python2*') )"
-
-RDEPEND="${CDEPEND}
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-	)
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' 'python2*')
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PDEPEND="
-	qt4? ( dev-python/qtconsole )
-	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd ${TEST_DIR} > /dev/null || die
-	"${EPYTHON}" -m IPython.testing.iptestcontroller --all || die
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/files/, dev-python/ipython/
@ 2018-05-16 12:32 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-05-16 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ab0a94d6c81e90a1626bb0683083b9cb315fea89
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 17:19:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 16 12:31:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0a94d6

dev-python/ipython: Drop old

Closes: https://bugs.gentoo.org/596714
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-python/ipython/Manifest                        |   1 -
 ...n-3.2.1-Don-t-redirect-from-edit-to-files.patch |  55 --------
 ...nly-redirect-to-editor-for-text-documents.patch |  38 -----
 .../ipython-3.2.1-set-mime-type-on-files.patch     |  35 -----
 ...et-model-mimetype-even-when-content-False.patch |  64 ---------
 dev-python/ipython/ipython-3.2.1-r1.ebuild         | 156 ---------------------
 dev-python/ipython/metadata.xml                    |   2 -
 7 files changed, 351 deletions(-)

diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 6289707afdf..5d3a9b77615 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,3 +1,2 @@
-DIST ipython-3.2.1.tar.gz 10884249 BLAKE2B eaeb5ad3cb1cfd38c5f81e0d312773e0ba617fc2ef735f5705edafd2e9bc65169302ea8f775843c7da5029bce0dccb541233a7c82faf58a676ac5079f9664734 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b

diff --git a/dev-python/ipython/files/ipython-3.2.1-Don-t-redirect-from-edit-to-files.patch b/dev-python/ipython/files/ipython-3.2.1-Don-t-redirect-from-edit-to-files.patch
deleted file mode 100644
index 5ec742c34cf..00000000000
--- a/dev-python/ipython/files/ipython-3.2.1-Don-t-redirect-from-edit-to-files.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Upstream patch to fix
-"Maliciously crafted text files in IPython/Jupyter editor".
-
-http://seclists.org/oss-sec/2015/q3/558
-https://bugs.gentoo.org/show_bug.cgi?id=560708
-
-
-From 2b835ca6daec2592d9127dc85bf2cdcfb718edf2 Mon Sep 17 00:00:00 2001
-From: Min RK <benjaminrk@gmail.com>
-Date: Mon, 20 Jul 2015 12:11:23 -0700
-Subject: [PATCH 4/4] Don't redirect from /edit/ to /files/
-
-show failure to decode, instead
----
- IPython/html/static/edit/js/editor.js | 15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/IPython/html/static/edit/js/editor.js b/IPython/html/static/edit/js/editor.js
-index dd12ea4..75d65e0 100644
---- a/IPython/html/static/edit/js/editor.js
-+++ b/IPython/html/static/edit/js/editor.js
-@@ -90,19 +90,10 @@ function($,
-             }).catch(
-             function(error) {
-                 that.events.trigger("file_load_failed.Editor", error);
--                if (((error.xhr||{}).responseJSON||{}).reason === 'bad format') {
--                    window.location = utils.url_path_join(
--                        that.base_url,
--                        'files',
--                        that.file_path
--                    );
--                } else {
--                    console.warn('Error while loading: the error was:')
--                    console.warn(error)
--                }
-+                console.warn('Error loading: ', error);
-                 cm.setValue("Error! " + error.message +
-                                 "\nSaving disabled.\nSee Console for more details.");
--                cm.setOption('readOnly','nocursor')
-+                cm.setOption('readOnly','nocursor');
-                 that.save_enabled = false;
-             }
-         );
-@@ -186,7 +177,7 @@ function($,
-     Editor.prototype._clean_state = function(){
-         var clean = this.codemirror.isClean(this.generation);
-         if (clean === this.clean){
--            return
-+            return;
-         } else {
-             this.clean = clean;
-         }
--- 
-2.4.6
-

diff --git a/dev-python/ipython/files/ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch b/dev-python/ipython/files/ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch
deleted file mode 100644
index 4b1f7d3686c..00000000000
--- a/dev-python/ipython/files/ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream patch to fix
-"Maliciously crafted text files in IPython/Jupyter editor".
-
-http://seclists.org/oss-sec/2015/q3/558
-https://bugs.gentoo.org/show_bug.cgi?id=560708
-
-
-From df24d9153b86863ccfa98bf509704d9304143ce1 Mon Sep 17 00:00:00 2001
-From: Min RK <benjaminrk@gmail.com>
-Date: Mon, 20 Jul 2015 12:11:04 -0700
-Subject: [PATCH 3/4] only redirect to editor for text documents
-
-treat unidentified mime-types as text
----
- IPython/html/static/tree/js/notebooklist.js | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
-index 0065143..d8c7b2a 100644
---- a/IPython/html/static/tree/js/notebooklist.js
-+++ b/IPython/html/static/tree/js/notebooklist.js
-@@ -532,6 +532,13 @@ define([
-             icon = 'running_' + icon;
-         }
-         var uri_prefix = NotebookList.uri_prefixes[model.type];
-+        if (model.type === 'file' &&
-+            model.mimetype && model.mimetype.substr(0,5) !== 'text/'
-+        ) {
-+            // send text/unidentified files to editor, others go to raw viewer
-+            uri_prefix = 'files';
-+        }
-+        
-         item.find(".item_icon").addClass(icon).addClass('icon-fixed-width');
-         var link = item.find("a.item_link")
-             .attr('href',
--- 
-2.4.6
-

diff --git a/dev-python/ipython/files/ipython-3.2.1-set-mime-type-on-files.patch b/dev-python/ipython/files/ipython-3.2.1-set-mime-type-on-files.patch
deleted file mode 100644
index b5d4b5fbd66..00000000000
--- a/dev-python/ipython/files/ipython-3.2.1-set-mime-type-on-files.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream patch to fix
-"Maliciously crafted text files in IPython/Jupyter editor".
-
-http://seclists.org/oss-sec/2015/q3/558
-https://bugs.gentoo.org/show_bug.cgi?id=560708
-
-
-From d729ce7c2063c0de746a7c2ea39697040d0af5bf Mon Sep 17 00:00:00 2001
-From: Min RK <benjaminrk@gmail.com>
-Date: Mon, 20 Jul 2015 12:10:10 -0700
-Subject: [PATCH 1/4] set mime-type on /files/
-
----
- IPython/html/files/handlers.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/IPython/html/files/handlers.py b/IPython/html/files/handlers.py
-index 7727d08..b358d94 100644
---- a/IPython/html/files/handlers.py
-+++ b/IPython/html/files/handlers.py
-@@ -40,6 +40,11 @@ def get(self, path):
-             cur_mime = mimetypes.guess_type(name)[0]
-             if cur_mime is not None:
-                 self.set_header('Content-Type', cur_mime)
-+            else:
-+                if model['format'] == 'base64':
-+                    self.set_header('Content-Type', 'application/octet-stream')
-+                else:
-+                    self.set_header('Content-Type', 'text/plain')
-         
-         if model['format'] == 'base64':
-             b64_bytes = model['content'].encode('ascii')
--- 
-2.4.6
-

diff --git a/dev-python/ipython/files/ipython-3.2.1-set-model-mimetype-even-when-content-False.patch b/dev-python/ipython/files/ipython-3.2.1-set-model-mimetype-even-when-content-False.patch
deleted file mode 100644
index a69f746f64c..00000000000
--- a/dev-python/ipython/files/ipython-3.2.1-set-model-mimetype-even-when-content-False.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Upstream patch to fix
-"Maliciously crafted text files in IPython/Jupyter editor".
-
-http://seclists.org/oss-sec/2015/q3/558
-https://bugs.gentoo.org/show_bug.cgi?id=560708
-
-
-From 50a1366a8fcfb94671c87199515ebc922882f447 Mon Sep 17 00:00:00 2001
-From: Min RK <benjaminrk@gmail.com>
-Date: Mon, 20 Jul 2015 12:10:25 -0700
-Subject: [PATCH 2/4] set model mimetype, even when content=False
-
----
- IPython/html/services/contents/filemanager.py | 12 +++++++-----
- IPython/html/services/contents/handlers.py    |  3 ---
- 2 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/IPython/html/services/contents/filemanager.py b/IPython/html/services/contents/filemanager.py
-index 01ce07b..c869c75 100644
---- a/IPython/html/services/contents/filemanager.py
-+++ b/IPython/html/services/contents/filemanager.py
-@@ -277,18 +277,20 @@ def _file_model(self, path, content=True, format=None):
-         model['type'] = 'file'
- 
-         os_path = self._get_os_path(path)
-+        model['mimetype'] = mimetypes.guess_type(os_path)[0]
- 
-         if content:
-             content, format = self._read_file(os_path, format)
--            default_mime = {
--                'text': 'text/plain',
--                'base64': 'application/octet-stream'
--            }[format]
-+            if model['mimetype'] is None:
-+                default_mime = {
-+                    'text': 'text/plain',
-+                    'base64': 'application/octet-stream'
-+                }[format]
-+                model['mimetype'] = default_mime
- 
-             model.update(
-                 content=content,
-                 format=format,
--                mimetype=mimetypes.guess_type(os_path)[0] or default_mime,
-             )
- 
-         return model
-diff --git a/IPython/html/services/contents/handlers.py b/IPython/html/services/contents/handlers.py
-index 5cd849e..d77e70e 100644
---- a/IPython/html/services/contents/handlers.py
-+++ b/IPython/html/services/contents/handlers.py
-@@ -52,9 +52,6 @@ def validate_model(model, expect_content):
-         )
- 
-     maybe_none_keys = ['content', 'format']
--    if model['type'] == 'file':
--        # mimetype should be populated only for file models
--        maybe_none_keys.append('mimetype')
-     if expect_content:
-         errors = [key for key in maybe_none_keys if model[key] is None]
-         if errors:
--- 
-2.4.6
-

diff --git a/dev-python/ipython/ipython-3.2.1-r1.ebuild b/dev-python/ipython/ipython-3.2.1-r1.ebuild
deleted file mode 100644
index 912566cbee2..00000000000
--- a/dev-python/ipython/ipython-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
-
-REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert octave qt4 wxwidgets )
-	doc? ( mongodb )"
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
-	octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
-	smp? ( >=dev-python/pyzmq-13[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-RDEPEND="${CDEPEND}
-	notebook? (
-		dev-libs/mathjax
-		dev-python/jinja[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
-		>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)
-	nbconvert? (
-		|| ( >=net-libs/nodejs-0.9.12 >=app-text/pandoc-1.12.1 )
-		dev-python/jinja[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	qt4? (
-		|| (
-			dev-python/PyQt4[${PYTHON_USEDEP},svg]
-			dev-python/PyQt5[${PYTHON_USEDEP},svg]
-			dev-python/pyside[${PYTHON_USEDEP},svg]
-		)
-		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-13[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-text/dvipng
-		dev-python/jinja[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/2.1.0-substitute-files.patch
-	"${FILESDIR}/${P}"-set-mime-type-on-files.patch
-	"${FILESDIR}/${P}"-set-model-mimetype-even-when-content-False.patch
-	"${FILESDIR}/${P}"-only-redirect-to-editor-for-text-documents.patch
-	"${FILESDIR}/${P}"-Don-t-redirect-from-edit-to-files.patch
-	)
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html_noapi
-}
-
-python_test() {
-	distutils_install_for_testing
-	# https://github.com/ipython/ipython/issues/8639
-	# Failure of some modules only in python3.4
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null || die
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null || die
-	}
-	VIRTUALX_COMMAND=run_tests virtualmake
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	use notebook && \
-		ln -sf "${EPREFIX}/usr/share/mathjax" "${D}$(python_get_sitedir)/IPython/html/static/mathjax"
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}

diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index f9fc713b4c4..2d738f93e42 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -43,10 +43,8 @@
 </longdescription>
   <use>
     <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
-    <flag name="mongodb">Enable support for MongoDB via <pkg>dev-python/pymongo</pkg></flag>
     <flag name="notebook">Install requirements for the web notebook based on <pkg>www-servers/tornado</pkg></flag>
     <flag name="nbconvert">Enable support for converting notebooks to various formats using <pkg>app-text/pandoc</pkg></flag>
-    <flag name="octave">Enable octave bridge via <pkg>dev-python/oct2py</pkg></flag>
   </use>
   <upstream>
     <remote-id type="pypi">ipython</remote-id>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/files/, dev-python/ipython/
@ 2024-05-27 13:39 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-05-27 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     eef908924225c7d1a5bc213d8616b9edd8d728bd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 13:21:47 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 27 13:39:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef90892

dev-python/ipython: Backport pytest-8 fixes

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../ipython/files/ipython-8.24.0-pytest-8.patch    | 125 ++++++++++++++
 dev-python/ipython/ipython-8.24.0-r1.ebuild        | 180 +++++++++++++++++++++
 2 files changed, 305 insertions(+)

diff --git a/dev-python/ipython/files/ipython-8.24.0-pytest-8.patch b/dev-python/ipython/files/ipython-8.24.0-pytest-8.patch
new file mode 100644
index 000000000000..04f1a1534ac5
--- /dev/null
+++ b/dev-python/ipython/files/ipython-8.24.0-pytest-8.patch
@@ -0,0 +1,125 @@
+From 7df70a3cd79068be6f98596e427d60a5d0cfe5b3 Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Thu, 23 May 2024 13:00:43 +1000
+Subject: [PATCH] Support pytest 8.1+ changes in pytest plugin
+
+Pytest 8.1 has also changed the plugin API, as well as required new
+keyword arguments. I've shifted the pytest version calculation to the
+module level so we can use it everywhere, and continue supporting all
+versions of pytest that we can.
+
+Fixes #14390
+---
+ IPython/testing/plugin/pytest_ipdoctest.py | 36 ++++++++++++++++------
+ 1 file changed, 26 insertions(+), 10 deletions(-)
+
+diff --git a/IPython/testing/plugin/pytest_ipdoctest.py b/IPython/testing/plugin/pytest_ipdoctest.py
+index fc8af13b579..40a3ae92b40 100644
+--- a/IPython/testing/plugin/pytest_ipdoctest.py
++++ b/IPython/testing/plugin/pytest_ipdoctest.py
+@@ -38,7 +38,11 @@
+ from _pytest.compat import safe_getattr
+ from _pytest.config import Config
+ from _pytest.config.argparsing import Parser
+-from _pytest.fixtures import FixtureRequest
++
++try:
++    from _pytest.fixtures import TopRequest as FixtureRequest
++except ImportError:
++    from _pytest.fixtures import FixtureRequest
+ from _pytest.nodes import Collector
+ from _pytest.outcomes import OutcomeException
+ from _pytest.pathlib import fnmatch_ex, import_path
+@@ -69,6 +73,8 @@
+ # Lazy definition of output checker class
+ CHECKER_CLASS: Optional[Type["IPDoctestOutputChecker"]] = None
+ 
++pytest_version = tuple([int(part) for part in pytest.__version__.split(".")])
++
+ 
+ def pytest_addoption(parser: Parser) -> None:
+     parser.addini(
+@@ -143,7 +149,7 @@ def pytest_collect_file(
+     return None
+ 
+ 
+-if int(pytest.__version__.split(".")[0]) < 7:
++if pytest_version[0] < 7:
+     _collect_file = pytest_collect_file
+ 
+     def pytest_collect_file(
+@@ -448,7 +454,7 @@ def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str
+         assert self.dtest is not None
+         return self.path, self.dtest.lineno, "[ipdoctest] %s" % self.name
+ 
+-    if int(pytest.__version__.split(".")[0]) < 7:
++    if pytest_version[0] < 7:
+ 
+         @property
+         def path(self) -> Path:
+@@ -521,7 +527,7 @@ def collect(self) -> Iterable[IPDoctestItem]:
+                 self, name=test.name, runner=runner, dtest=test
+             )
+ 
+-    if int(pytest.__version__.split(".")[0]) < 7:
++    if pytest_version[0] < 7:
+ 
+         @property
+         def path(self) -> Path:
+@@ -636,20 +642,26 @@ def _find(
+                     )
+ 
+         if self.path.name == "conftest.py":
+-            if int(pytest.__version__.split(".")[0]) < 7:
++            if pytest_version[0] < 7:
+                 module = self.config.pluginmanager._importconftest(
+                     self.path,
+                     self.config.getoption("importmode"),
+                 )
+             else:
++                kwargs = {"rootpath": self.config.rootpath}
++                if pytest_version >= (8, 1):
++                    kwargs["consider_namespace_packages"] = False
+                 module = self.config.pluginmanager._importconftest(
+                     self.path,
+                     self.config.getoption("importmode"),
+-                    rootpath=self.config.rootpath,
++                    **kwargs,
+                 )
+         else:
+             try:
+-                module = import_path(self.path, root=self.config.rootpath)
++                kwargs = {"root": self.config.rootpath}
++                if pytest_version >= (8, 1):
++                    kwargs["consider_namespace_packages"] = False
++                module = import_path(self.path, **kwargs)
+             except ImportError:
+                 if self.config.getvalue("ipdoctest_ignore_import_errors"):
+                     pytest.skip("unable to import module %r" % self.path)
+@@ -671,7 +683,7 @@ def _find(
+                     self, name=test.name, runner=runner, dtest=test
+                 )
+ 
+-    if int(pytest.__version__.split(".")[0]) < 7:
++    if pytest_version[0] < 7:
+ 
+         @property
+         def path(self) -> Path:
+@@ -701,11 +713,15 @@ def func() -> None:
+ 
+     doctest_item.funcargs = {}  # type: ignore[attr-defined]
+     fm = doctest_item.session._fixturemanager
++    kwargs = {"node": doctest_item, "func": func, "cls": None}
++    if pytest_version <= (8, 0):
++        kwargs["funcargs"] = False
+     doctest_item._fixtureinfo = fm.getfixtureinfo(  # type: ignore[attr-defined]
+-        node=doctest_item, func=func, cls=None, funcargs=False
++        **kwargs
+     )
+     fixture_request = FixtureRequest(doctest_item, _ispytest=True)
+-    fixture_request._fillfixtures()
++    if pytest_version <= (8, 0):
++        fixture_request._fillfixtures()
+     return fixture_request
+ 
+ 

diff --git a/dev-python/ipython/ipython-8.24.0-r1.ebuild b/dev-python/ipython/ipython-8.24.0-r1.ebuild
new file mode 100644
index 000000000000..799568843f24
--- /dev/null
+++ b/dev-python/ipython/ipython-8.24.0-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE='readline(+),sqlite,threads(+)'
+
+inherit distutils-r1 optfeature pypi virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="
+	https://ipython.org/
+	https://github.com/ipython/ipython/
+	https://pypi.org/project/ipython/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="doc examples notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.41[${PYTHON_USEDEP}]
+	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	dev-python/stack-data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.13.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+	' 3.10)
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10 3.11)
+"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/pickleshare[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	$(python_gen_cond_dep '
+		notebook? (
+			dev-python/notebook[${PYTHON_USEDEP}]
+			dev-python/ipywidgets[${PYTHON_USEDEP}]
+			dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+		)
+		qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	' 'python*')
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/2.1.0-substitute-files.patch
+	# https://github.com/ipython/ipython/pull/14441
+	"${FILESDIR}/${P}-pytest-8.patch"
+)
+
+python_prepare_all() {
+	# Remove out of date insource files
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# TODO: looks to be a regression due to a newer dep
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# https://github.com/numpy/numpy/issues/25164
+				IPython/lib/tests/test_display.py::TestAudioDataWithoutNumpy
+			)
+			;;
+	esac
+
+	# nonfatal implied by virtx
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest -p asyncio --asyncio-mode=auto ||
+		die "Tests failed on ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "code formatting" dev-python/black
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line-profiler
+	optfeature "%matplotlib magic command" dev-python/matplotlib-inline
+
+	if use nbconvert; then
+		if ! has_version virtual/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/files/, dev-python/ipython/
@ 2024-05-27 13:39 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-05-27 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     b51651157a3da02a8a16d43e27ebe2ffc63d7e7e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 13:28:46 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 27 13:39:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5165115

dev-python/ipython: Backport matplotlib-3.9 fixes

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../ipython/files/ipython-8.24.0-mpl-3.9.patch     | 72 ++++++++++++++++++++++
 dev-python/ipython/ipython-8.24.0-r1.ebuild        |  4 +-
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/dev-python/ipython/files/ipython-8.24.0-mpl-3.9.patch b/dev-python/ipython/files/ipython-8.24.0-mpl-3.9.patch
new file mode 100644
index 000000000000..927cc95ccf29
--- /dev/null
+++ b/dev-python/ipython/files/ipython-8.24.0-mpl-3.9.patch
@@ -0,0 +1,72 @@
+diff --git a/IPython/core/pylabtools.py b/IPython/core/pylabtools.py
+index 1f5a11f37e..4287834418 100644
+--- a/IPython/core/pylabtools.py
++++ b/IPython/core/pylabtools.py
+@@ -345,8 +345,10 @@ def find_gui_and_backend(gui=None, gui_select=None):
+             backend = matplotlib.rcParamsOrig["backend"]
+             backend, gui = backend_registry.resolve_backend(backend)
+         else:
++            gui = _convert_gui_to_matplotlib(gui)
+             backend, gui = backend_registry.resolve_gui_or_backend(gui)
+ 
++        gui = _convert_gui_from_matplotlib(gui)
+         return gui, backend
+ 
+     # Fallback to previous behaviour (Matplotlib < 3.9)
+@@ -509,10 +511,28 @@ def _list_matplotlib_backends_and_gui_loops() -> list[str]:
+     if _matplotlib_manages_backends():
+         from matplotlib.backends.registry import backend_registry
+ 
+-        ret = backend_registry.list_all() + backend_registry.list_gui_frameworks()
++        ret = backend_registry.list_all() + [
++            _convert_gui_from_matplotlib(gui)
++            for gui in backend_registry.list_gui_frameworks()
++        ]
+     else:
+         from IPython.core import pylabtools
+ 
+         ret = list(pylabtools.backends.keys())
+ 
+     return sorted(["auto"] + ret)
++
++
++# Matplotlib and IPython do not always use the same gui framework name.
++# Always use the approprate one of these conversion functions when passing a
++# gui framework name to/from Matplotlib.
++def _convert_gui_to_matplotlib(gui: str | None) -> str | None:
++    if gui and gui.lower() == "osx":
++        return "macosx"
++    return gui
++
++
++def _convert_gui_from_matplotlib(gui: str | None) -> str | None:
++    if gui and gui.lower() == "macosx":
++        return "osx"
++    return gui
+diff --git a/IPython/core/tests/test_pylabtools.py b/IPython/core/tests/test_pylabtools.py
+index 4099f04044..6bddb34807 100644
+--- a/IPython/core/tests/test_pylabtools.py
++++ b/IPython/core/tests/test_pylabtools.py
+@@ -276,11 +276,11 @@ def test_figure_no_canvas():
+         # name is gui
+         ("gtk3", "gtk3", "gtk3agg"),
+         ("gtk4", "gtk4", "gtk4agg"),
+-        ("headless", "headless", "agg"),
++        ("headless", None, "agg"),
+         ("osx", "osx", "macosx"),
+         ("qt", "qt", "qtagg"),
+         ("qt5", "qt5", "qt5agg"),
+-        ("qt6", "qt6", "qt6agg"),
++        ("qt6", "qt6", "qtagg"),
+         ("tk", "tk", "tkagg"),
+         ("wx", "wx", "wxagg"),
+         # name is backend
+@@ -301,8 +301,6 @@ def test_figure_no_canvas():
+         ("qtcairo", "qt", "qtcairo"),
+         ("qt5agg", "qt5", "qt5agg"),
+         ("qt5cairo", "qt5", "qt5cairo"),
+-        ("qt6agg", "qt", "qt6agg"),
+-        ("qt6cairo", "qt", "qt6cairo"),
+         ("tkagg", "tk", "tkagg"),
+         ("tkcairo", "tk", "tkcairo"),
+         ("webagg", "webagg", "webagg"),

diff --git a/dev-python/ipython/ipython-8.24.0-r1.ebuild b/dev-python/ipython/ipython-8.24.0-r1.ebuild
index 799568843f24..abefb66944bd 100644
--- a/dev-python/ipython/ipython-8.24.0-r1.ebuild
+++ b/dev-python/ipython/ipython-8.24.0-r1.ebuild
@@ -45,7 +45,7 @@ BDEPEND="
 	test? (
 		app-text/dvipng[truetype]
 		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.9[${PYTHON_USEDEP}]
 		dev-python/nbformat[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
 		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
@@ -88,6 +88,8 @@ PATCHES=(
 	"${FILESDIR}"/2.1.0-substitute-files.patch
 	# https://github.com/ipython/ipython/pull/14441
 	"${FILESDIR}/${P}-pytest-8.patch"
+	# https://github.com/ipython/ipython/pull/14420
+	"${FILESDIR}/${P}-mpl-3.9.patch"
 )
 
 python_prepare_all() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-05-27 13:39 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-16 12:32 [gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/files/, dev-python/ipython/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-05-27 13:39 Michał Górny
2024-05-27 13:39 Michał Górny
2017-05-03  7:37 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox