From 20828f1f2f34eac38b4806f7db9adb6ecad70399 Mon Sep 17 00:00:00 2001 From: Louis Sautier Date: Tue, 20 Nov 2018 14:43:51 +0100 Subject: dev-python/ipython: also enforce prompt_toolkit-2 dep. for 6.1.0 Bug: https://bugs.gentoo.org/669926 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Louis Sautier --- dev-python/ipython/ipython-6.1.0-r1.ebuild | 126 ---------------------------- dev-python/ipython/ipython-6.1.0-r2.ebuild | 127 +++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 126 deletions(-) delete mode 100644 dev-python/ipython/ipython-6.1.0-r1.ebuild create mode 100644 dev-python/ipython/ipython-6.1.0-r2.ebuild (limited to 'dev-python/ipython') diff --git a/dev-python/ipython/ipython-6.1.0-r1.ebuild b/dev-python/ipython/ipython-6.1.0-r1.ebuild deleted file mode 100644 index d89e54743ec2..000000000000 --- a/dev-python/ipython/ipython-6.1.0-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( 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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples matplotlib notebook nbconvert qt5 smp test" - -CDEPEND=" - dev-python/decorator[${PYTHON_USEDEP}] - >=dev-python/jedi-0.10.0[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - dev-python/pickleshare[${PYTHON_USEDEP}] - >=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/simplegeneric[${PYTHON_USEDEP}] - >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}] - matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) -" - -RDEPEND="${CDEPEND} - nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] ) -" - -DEPEND="${CDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - virtual/python-typing[${PYTHON_USEDEP}] - test? ( - dev-python/ipykernel[${PYTHON_USEDEP}] - dev-python/nbformat[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/testpath[${PYTHON_USEDEP}] - ) - doc? ( - dev-python/ipykernel[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}] - ) -" - -PDEPEND=" - notebook? ( - dev-python/notebook[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - ) - qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] ) - 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() { - if use doc; then - emake -C docs html_noapi - HTML_DOCS=( docs/build/html/. ) - fi -} - -python_test() { - distutils_install_for_testing - pushd "${TEST_DIR}" >/dev/null || die - "${TEST_DIR}"/scripts/iptest || 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() { - 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 -} diff --git a/dev-python/ipython/ipython-6.1.0-r2.ebuild b/dev-python/ipython/ipython-6.1.0-r2.ebuild new file mode 100644 index 000000000000..cf2d06ab0493 --- /dev/null +++ b/dev-python/ipython/ipython-6.1.0-r2.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( 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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples matplotlib notebook nbconvert qt5 smp test" + +CDEPEND=" + dev-python/decorator[${PYTHON_USEDEP}] + >=dev-python/jedi-0.10.0[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + dev-python/pickleshare[${PYTHON_USEDEP}] + >=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}] + =dev-python/traitlets-4.2.1[${PYTHON_USEDEP}] + matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) +" + +RDEPEND="${CDEPEND} + nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] ) +" + +DEPEND="${CDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + virtual/python-typing[${PYTHON_USEDEP}] + test? ( + dev-python/ipykernel[${PYTHON_USEDEP}] + dev-python/nbformat[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/testpath[${PYTHON_USEDEP}] + ) + doc? ( + dev-python/ipykernel[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}] + ) +" + +PDEPEND=" + notebook? ( + dev-python/notebook[${PYTHON_USEDEP}] + dev-python/ipywidgets[${PYTHON_USEDEP}] + ) + qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] ) + 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() { + if use doc; then + emake -C docs html_noapi + HTML_DOCS=( docs/build/html/. ) + fi +} + +python_test() { + distutils_install_for_testing + pushd "${TEST_DIR}" >/dev/null || die + "${TEST_DIR}"/scripts/iptest || 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() { + 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 +} -- cgit v1.2.3-65-gdbad