From e5efb3b06d62a8eba8bcd31e4d3a76b160850f5a Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Tue, 10 Jan 2012 22:14:58 +0000 Subject: Removed bundled libraries, added suggested dependencies and optional ones as run depedencies. Propagate global patch prefix friendly. Fix tests, some other modifications from Arfrever (Portage version: 2.1.10.41/cvs/Linux x86_64) --- dev-python/ipython/ChangeLog | 10 +- .../ipython/files/ipython-0.12-globalpath.patch | 16 +++ dev-python/ipython/ipython-0.12-r1.ebuild | 147 +++++++++++++++++++++ dev-python/ipython/ipython-0.12.ebuild | 89 ------------- dev-python/ipython/metadata.xml | 2 + 5 files changed, 174 insertions(+), 90 deletions(-) create mode 100644 dev-python/ipython/files/ipython-0.12-globalpath.patch create mode 100644 dev-python/ipython/ipython-0.12-r1.ebuild delete mode 100644 dev-python/ipython/ipython-0.12.ebuild (limited to 'dev-python/ipython') diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog index a91a0a671c88..e6705f8fdb9a 100644 --- a/dev-python/ipython/ChangeLog +++ b/dev-python/ipython/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-python/ipython # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.88 2012/01/08 22:07:39 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.89 2012/01/10 22:14:58 bicatali Exp $ + +*ipython-0.12-r1 (10 Jan 2012) + + 10 Jan 2012; Sébastien Fabbro -ipython-0.12.ebuild, + +ipython-0.12-r1.ebuild, +files/ipython-0.12-globalpath.patch, metadata.xml: + Removed bundled libraries, added suggested dependencies and optional ones as + run depedencies. Propagate global patch prefix friendly. Fix tests, some + other modifications from Arfrever *ipython-0.12 (08 Jan 2012) diff --git a/dev-python/ipython/files/ipython-0.12-globalpath.patch b/dev-python/ipython/files/ipython-0.12-globalpath.patch new file mode 100644 index 000000000000..fa7bbdc14fe8 --- /dev/null +++ b/dev-python/ipython/files/ipython-0.12-globalpath.patch @@ -0,0 +1,16 @@ +--- IPython/quarantine/ipy_gnuglobal.py.orig 2012-01-10 20:16:35.153515474 +0000 ++++ IPython/quarantine/ipy_gnuglobal.py 2012-01-10 20:18:30.196504374 +0000 +@@ -7,10 +7,11 @@ + + from IPython.core import ipapi + ip = ipapi.get() +-import os ++import os ++import sys + + # alter to your liking +-global_bin = 'd:/opt/global/bin/global' ++global_bin = os.path.join(sys.prefix,'bin','global') + + def global_f(self,cmdline): + simple = 0 diff --git a/dev-python/ipython/ipython-0.12-r1.ebuild b/dev-python/ipython/ipython-0.12-r1.ebuild new file mode 100644 index 000000000000..0be542e336c8 --- /dev/null +++ b/dev-python/ipython/ipython-0.12-r1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.12-r1.ebuild,v 1.1 2012/01/10 22:14:58 bicatali Exp $ + +EAPI=4 + +# python eclass cruft +PYTHON_USE_DEPEND="readline? sqlite?" +PYTHON_MODNAME="IPython" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="2.[45]" + +inherit distutils elisp-common eutils virtualx + +DESCRIPTION="Advanced interactive shell for Python" +HOMEPAGE="http://ipython.org/" +SRC_URI="http://archive.ipython.org/release/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc emacs examples matplotlib mongodb notebook readline +smp + qt4 sqlite test wxwidgets" + + +CDEPEND="dev-python/decorator + || ( dev-python/argparse =dev-lang/python-2.7* >=dev-lang/python-3.2 ) + dev-python/pexpect + dev-python/pyparsing + dev-python/simplegeneric + emacs? ( app-emacs/python-mode virtual/emacs ) + matplotlib? ( dev-python/matplotlib ) + mongodb? ( dev-python/pymongo ) + smp? ( dev-python/pyzmq ) + wxwidgets? ( dev-python/wxpython )" +RDEPEND="${CDEPEND} + notebook? ( >=www-servers/tornado-2.1 + dev-python/pygments + dev-python/pyzmq ) + qt4? ( || ( dev-python/PyQt4 dev-python/pyside ) + dev-python/pygments + dev-python/pyzmq )" +DEPEND="${CDEPEND} + test? ( dev-python/nose )" + +src_prepare() { + distutils_src_prepare + epatch "${FILESDIR}"/${P}-globalpath.patch + + # fix for gentoo python scripts + sed -i \ + -e "/ipython_cmd/s/ipython3/ipython/g" \ + IPython/frontend/terminal/console/tests/test_console.py \ + IPython/lib/irunner.py \ + IPython/testing/tools.py || die + + sed -i \ + -e "s/find_scripts(True, suffix='3')/find_scripts(True)/" \ + setup3.py || die + + # failing tests + sed -i \ + -e 's/test_smoketest_aimport/_&/' \ + -e 's/test_smoketest_autoreload/_&/' \ + IPython/extensions/tests/test_autoreload.py || die + sed -i \ + -e 's/test_pylab_import_all_disabled/_&/' \ + -e 's/test_pylab_import_all_enabled/_&/' \ + IPython/lib/tests/test_irunner_pylab_magic.py || die + sed -i \ + -e '/test_startup_py/i\\@dec.known_failure_py3' \ + -e '/test_startup_ipy/i\\@dec.known_failure_py3' \ + IPython/core/tests/test_profile.py || die + sed -i \ + -e '/test_tclass/i\\ @dec.known_failure_py3' \ + IPython/core/tests/test_run.py || die + + # installation directory for documentation + sed -i \ + -e "/docdirbase = pjoin/s/ipython/${PF}/" \ + -e "/pjoin(docdirbase,'manual')/s/manual/html/" \ + setupbase.py || die "sed failed" + + rm -rf docs/html/{.buildinfo,_sources,objects.inv} || die + + if ! use doc; then + sed -i \ + -e "/(pjoin(docdirbase, 'extensions'), igridhelpfiles),/d" \ + -e 's/ + manual_files//' \ + setupbase.py || die + fi + + if ! use examples; then + sed -i \ + -e 's/+ example_files//' \ + setupbase.py || die + fi +} + +src_compile() { + distutils_src_compile + use emacs && elisp-compile docs/emacs/ipython.el +} + +src_test() { + if use mongodb; then + mkdir -p "${T}/mongo.db" + mongod --dbpath "${T}/mongo.db" --fork --logpath "${T}/mongo.log" + fi + + testing() { + "$(PYTHON)" setup.py \ + build -b "build-${PYTHON_ABI}" \ + install --root="${T}/tests-${PYTHON_ABI}" > /dev/null || die + # Initialize ~/.ipython directory. + PATH="${T}/tests-${PYTHON_ABI}${EPREFIX}/usr/bin:${PATH}" \ + PYTHONPATH="${T}/tests-${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)" \ + ipython <<< "" > /dev/null || return 1 + # Run tests (-v for more verbosity). + PATH="${T}/tests-${PYTHON_ABI}${EPREFIX}/usr/bin:${PATH}" \ + PYTHONPATH="${T}/tests-${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)" \ + iptest -v || return 1 + } + VIRTUALX_COMMAND="python_execute_function" virtualmake testing + + use mongodb && killall -u "$(id -nu)" mongod +} + +src_install() { + distutils_src_install + if use emacs; then + pushd docs/emacs > /dev/null + elisp-install ${PN} ${PN}.el* + elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el + popd > /dev/null + fi +} + +pkg_postinst() { + distutils_pkg_postinst + use emacs && elisp-site-regen +} + +pkg_postrm() { + distutils_pkg_postrm + use emacs && elisp-site-regen +} diff --git a/dev-python/ipython/ipython-0.12.ebuild b/dev-python/ipython/ipython-0.12.ebuild deleted file mode 100644 index d37e6bce6d78..000000000000 --- a/dev-python/ipython/ipython-0.12.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.12.ebuild,v 1.1 2012/01/08 22:07:39 bicatali Exp $ - -EAPI=4 - -# python eclass cruft -PYTHON_USE_DEPEND="readline sqlite" -PYTHON_MODNAME="IPython" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.[45]" - -inherit distutils elisp-common eutils - -DESCRIPTION="Advanced interactive shell for Python" -HOMEPAGE="http://ipython.org/" -SRC_URI="http://archive.ipython.org/release/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc emacs examples notebook +smp qt4 test wxwidgets" - -CDEPEND="dev-python/pexpect - emacs? ( app-emacs/python-mode virtual/emacs ) - smp? ( dev-python/pyzmq ) - wxwidgets? ( dev-python/wxpython )" -RDEPEND="${CDEPEND} - notebook? ( www-servers/tornado - dev-python/pygments - dev-python/pyzmq ) - qt4? ( || ( dev-python/PyQt4 dev-python/pyside ) - dev-python/pygments - dev-python/pyzmq )" -DEPEND="${CDEPEND} - test? ( dev-python/nose )" - -SITEFILE="62ipython-gentoo.el" - -src_prepare() { - sed -i \ - -e "/docdirbase/s:ipython:${PF}:" \ - setupbase.py || die "sed failed" - if ! use doc; then - sed -i \ - -e 's/+ manual_files//' \ - setupbase.py || die "sed failed" - fi - if ! use examples; then - sed -i \ - -e 's/+ example_files//' \ - setupbase.py || die "sed failed" - fi -} - -src_compile() { - distutils_src_compile - use emacs && elisp-compile docs/emacs/ipython.el -} - -src_test() { - testing() { - pushd build-${PYTHON_ABI} > /dev/null - PYTHONPATH=lib PATH="scripts-${PYTHON_ABI}:${PTHONPATH}" \ - iptest"$([[ ${PYTHON_ABI} == 3.* ]] && echo 3)" - popd > /dev/null - } - python_execute_function testing -} - -src_install() { - distutils_src_install - if use emacs; then - pushd docs/emacs > /dev/null - elisp-install ${PN} ${PN}.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - popd > /dev/null - fi -} - -pkg_postinst() { - distutils_pkg_postinst - use emacs && elisp-site-regen -} - -pkg_postrm() { - distutils_pkg_postrm - use emacs && elisp-site-regen -} diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml index b8e2b1057faf..a99b6643630e 100644 --- a/dev-python/ipython/metadata.xml +++ b/dev-python/ipython/metadata.xml @@ -41,6 +41,8 @@ Main features: * pdbデバッガとprofilerへの統合アクセス。 + Add support for dev-python/matplotlib + Enable support for MongoDB via dev-python/pymongo Install requirements for the web notebook based on www-servers/tornado -- cgit v1.2.3-65-gdbad