From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 25113138247 for ; Mon, 6 Jan 2014 19:58:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D266E0C2F; Mon, 6 Jan 2014 19:58:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7DECCE0C2F for ; Mon, 6 Jan 2014 19:58:02 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 71D9133F73F for ; Mon, 6 Jan 2014 19:58:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id ED816E5535 for ; Mon, 6 Jan 2014 19:57:59 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1389037672.7c1a01cccdec773839cb0c3e323ad24d949e3c50.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/mne-python/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/mne-python/ChangeLog sci-biology/mne-python/metadata.xml sci-biology/mne-python/mne-python-0.7.ebuild sci-biology/mne-python/mne-python-9999.ebuild X-VCS-Directories: sci-biology/mne-python/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 7c1a01cccdec773839cb0c3e323ad24d949e3c50 X-VCS-Branch: master Date: Mon, 6 Jan 2014 19:57:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: afff96b2-b3e6-460a-bb3b-03cc083971c5 X-Archives-Hash: 6198eb0122d1ede30478e440c90366e7 commit: 7c1a01cccdec773839cb0c3e323ad24d949e3c50 Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 6 19:47:52 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 6 19:47:52 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7c1a01cc sci-biology/mne-python: Add missing metadata.xml; drop USE=cuda; fix python deps Package-Manager: portage-2.2.8 --- sci-biology/mne-python/ChangeLog | 8 ++++ sci-biology/mne-python/metadata.xml | 5 +++ sci-biology/mne-python/mne-python-0.7.ebuild | 56 ++++++++++++++------------- sci-biology/mne-python/mne-python-9999.ebuild | 56 ++++++++++++++------------- 4 files changed, 71 insertions(+), 54 deletions(-) diff --git a/sci-biology/mne-python/ChangeLog b/sci-biology/mne-python/ChangeLog new file mode 100644 index 0000000..da32b15 --- /dev/null +++ b/sci-biology/mne-python/ChangeLog @@ -0,0 +1,8 @@ +# ChangeLog for sci-biology/mne-python +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 06 Jan 2014; Justin Lecher mne-python-0.7.ebuild, + mne-python-9999.ebuild, +metadata.xml: + Add missing metadata.xml; drop USE=cuda; fix python deps + diff --git a/sci-biology/mne-python/metadata.xml b/sci-biology/mne-python/metadata.xml new file mode 100644 index 0000000..897aa2e --- /dev/null +++ b/sci-biology/mne-python/metadata.xml @@ -0,0 +1,5 @@ + + + + sci + diff --git a/sci-biology/mne-python/mne-python-0.7.ebuild b/sci-biology/mne-python/mne-python-0.7.ebuild index ad1fa8b..31385eb 100644 --- a/sci-biology/mne-python/mne-python-0.7.ebuild +++ b/sci-biology/mne-python/mne-python-0.7.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 virtualx @@ -14,42 +14,44 @@ SRC_URI="https://github.com/mne-tools/mne-python/archive/v${PV}.zip" LICENSE="BSD" SLOT="0" -IUSE="test cuda" +IUSE="test" +#IUSE="cuda test" KEYWORDS="~x86 ~amd64" RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - sci-libs/scikits_learn[${PYTHON_USEDEP}] - dev-python/joblib[${PYTHON_USEDEP}] - sci-libs/nibabel[${PYTHON_USEDEP}] - sci-biology/pysurfer[${PYTHON_USEDEP}] - sci-visualization/mayavi[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - cuda? ( - dev-python/pycuda[${PYTHON_USEDEP}] - dev-python/scikits-cuda[${PYTHON_USEDEP}] - ) -" + dev-python/numpy[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + sci-libs/scikits_learn[${PYTHON_USEDEP}] + dev-python/joblib[${PYTHON_USEDEP}] + sci-libs/nibabel[${PYTHON_USEDEP}] + sci-biology/pysurfer[${PYTHON_USEDEP}] + sci-visualization/mayavi + dev-python/matplotlib[${PYTHON_USEDEP}]" + +# cuda? ( +# dev-python/pycuda[${PYTHON_USEDEP}] +# dev-python/scikits-cuda[${PYTHON_USEDEP}] +# ) +#" DEPEND=" - test? ( dev-python/nose ${RDEPEND} ) + test? ( dev-python/nose ${RDEPEND} ) " S="${WORKDIR}/mne-python-${PV}" run_test() { - PYTHONPATH=. MNE_SKIP_SAMPLE_DATASET_TESTS=1 nosetests -v mne + PYTHONPATH=. MNE_SKIP_SAMPLE_DATASET_TESTS=1 nosetests -v mne } python_test() { - distutils_install_for_testing - esetup.py install --root="${T}/test-${EPYTHON}" --no-compile - # Link to test data that won't be included in the final installation - local TEST_DIR="${T}/test-${EPYTHON}/$(python_get_sitedir)" - cd ${S} || die - find . -type d -name data -exec ln -s ${S}/{} ${TEST_DIR}/{} \; || die - cd ${TEST_DIR} || die - VIRTUALX_COMMAND="run_test" - virtualmake + distutils_install_for_testing + esetup.py install --root="${T}/test-${EPYTHON}" --no-compile + # Link to test data that won't be included in the final installation + local TEST_DIR="${T}/test-${EPYTHON}/$(python_get_sitedir)" + cd "${S}" || die + find . -type d -name data -exec ln -s "${S}"/{} ${TEST_DIR}/{} \; || die + cd ${TEST_DIR} || die + VIRTUALX_COMMAND="run_test" + virtualmake } diff --git a/sci-biology/mne-python/mne-python-9999.ebuild b/sci-biology/mne-python/mne-python-9999.ebuild index 5836216..2403e2c 100644 --- a/sci-biology/mne-python/mne-python-9999.ebuild +++ b/sci-biology/mne-python/mne-python-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 git-r3 virtualx @@ -14,40 +14,42 @@ EGIT_REPO_URI="https://github.com/mne-tools/mne-python.git" LICENSE="BSD" SLOT="0" -IUSE="test cuda" +IUSE="test" +#IUSE="cuda test" KEYWORDS="" RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - sci-libs/scikits_learn[${PYTHON_USEDEP}] - dev-python/joblib[${PYTHON_USEDEP}] - sci-libs/nibabel[${PYTHON_USEDEP}] - sci-biology/pysurfer[${PYTHON_USEDEP}] - sci-visualization/mayavi[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - cuda? ( - dev-python/pycuda[${PYTHON_USEDEP}] - dev-python/scikits-cuda[${PYTHON_USEDEP}] - ) -" + dev-python/numpy[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + sci-libs/scikits_learn[${PYTHON_USEDEP}] + dev-python/joblib[${PYTHON_USEDEP}] + sci-libs/nibabel[${PYTHON_USEDEP}] + sci-biology/pysurfer[${PYTHON_USEDEP}] + sci-visualization/mayavi + dev-python/matplotlib[${PYTHON_USEDEP}]" + +# cuda? ( +# dev-python/pycuda[${PYTHON_USEDEP}] +# dev-python/scikits-cuda[${PYTHON_USEDEP}] +# ) +#" DEPEND=" - test? ( dev-python/nose ${RDEPEND} ) + test? ( dev-python/nose ${RDEPEND} ) " run_test() { - PYTHONPATH=. MNE_SKIP_SAMPLE_DATASET_TESTS=1 nosetests -v mne + PYTHONPATH=. MNE_SKIP_SAMPLE_DATASET_TESTS=1 nosetests -v mne } python_test() { - distutils_install_for_testing - esetup.py install --root="${T}/test-${EPYTHON}" --no-compile - # Link to test data that won't be included in the final installation - local TEST_DIR="${T}/test-${EPYTHON}/$(python_get_sitedir)" - cd ${S} || die - find . -type d -name data -exec ln -s ${S}/{} ${TEST_DIR}/{} \; || die - cd ${TEST_DIR} || die - VIRTUALX_COMMAND="run_test" - virtualmake + distutils_install_for_testing + esetup.py install --root="${T}/test-${EPYTHON}" --no-compile + # Link to test data that won't be included in the final installation + local TEST_DIR="${T}/test-${EPYTHON}/$(python_get_sitedir)" + cd "${S}" || die + find . -type d -name data -exec ln -s "${S}"/{} ${TEST_DIR}/{} \; || die + cd ${TEST_DIR} || die + VIRTUALX_COMMAND="run_test" + virtualmake }