public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/mne-python/
Date: Mon,  6 Jan 2014 19:57:59 +0000 (UTC)	[thread overview]
Message-ID: <1389037672.7c1a01cccdec773839cb0c3e323ad24d949e3c50.jlec@gentoo> (raw)

commit:     7c1a01cccdec773839cb0c3e323ad24d949e3c50
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 19:47:52 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec@gentoo.org> 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+</pkgmetadata>

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
 }


             reply	other threads:[~2014-01-06 19:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-06 19:57 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-26  9:18 [gentoo-commits] proj/sci:master commit in: sci-biology/mne-python/ Horea Christian
2013-11-26 22:30 Sebastien Fabbro
2013-11-18 20:01 Justin Lecher
2013-11-18 20:01 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1389037672.7c1a01cccdec773839cb0c3e323ad24d949e3c50.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox