aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bock <nicolasbock@gmail.com>2013-09-17 11:33:40 -0600
committerNicolas Bock <nicolasbock@gmail.com>2013-09-17 11:33:40 -0600
commit071990a51a69ae821610c46cc04f319fe006c546 (patch)
treec52c6f285be4930e4e62b749efe34c89ab3c684d /sci-libs/scikits_image
parentsci-chemistry/freeon-1.0 Updated manifest for tar file. (diff)
parentMerge github.com:gentoo-science/sci (diff)
downloadsci-071990a51a69ae821610c46cc04f319fe006c546.tar.gz
sci-071990a51a69ae821610c46cc04f319fe006c546.tar.bz2
sci-071990a51a69ae821610c46cc04f319fe006c546.zip
Merge branch 'master' of github.com:gentoo-science/sci
Diffstat (limited to 'sci-libs/scikits_image')
-rw-r--r--sci-libs/scikits_image/ChangeLog5
-rw-r--r--sci-libs/scikits_image/metadata.xml17
-rw-r--r--sci-libs/scikits_image/scikits_image-9999.ebuild18
3 files changed, 29 insertions, 11 deletions
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 249a0b61b..2b3abdf68 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 17 Sep 2013; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
+ scikits_image-9999.ebuild:
+ sci-libs/scikits_image: Fix source directory, update dependencies, cleanup
+ (bug #484428)
+
19 Aug 2013; Sébastien Fabbro <bicatali@gentoo.org> scikits_image-9999.ebuild:
sci-libs/scikits_image: Revert to esetup.py instead of for testing, remove
scikits depedency
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
new file mode 100644
index 000000000..51476ec31
--- /dev/null
+++ b/sci-libs/scikits_image/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+ This SciKit (toolkit for SciPy) includes useful image processing
+ algorithms for use with Python and NumPy. While SciPy’s ndimage
+ provides low-level manipulation, scikits.image centres around
+ algorithms and applications.
+</longdescription>
+<use>
+ <flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
+</use>
+<upstream>
+ <remote-id type="pypi">scikit-image</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/sci-libs/scikits_image/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index 6174f069d..bcb232c18 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -8,9 +8,7 @@ EAPI=5
#PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
PYTHON_COMPAT=( python{2_6,2_7} )
-inherit distutils-r1 git-2
-
-MYPN="${PN/scikits_/scikit-}"
+inherit distutils-r1 git-r3
DESCRIPTION="Image processing routines for SciPy"
HOMEPAGE="http://scikit-image.org/"
@@ -27,25 +25,23 @@ RDEPEND="
gtk? ( dev-python/pygtk[$(python_gen_usedep 'python2*')] )
qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
DEPEND="
- >=dev-python/cython-0.15[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+ >=dev-python/cython-0.17[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/matplotlib[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/pyamg[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
+ sci-libs/scipy[sparse,${PYTHON_USEDEP}] )"
-DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt )
+DOCS=( CONTRIBUTORS.txt CONTRIBUTING.txt README.md DEPENDS.txt RELEASE.txt TASKS.txt )
python_test() {
+ # distutils_install_for_testing not working here
esetup.py \
install --root="${T}/test-${EPYTHON}" \
--no-compile || die "install test failed"
- #distutils_install_for_testing
cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
echo "backend: Agg" > matplotlibrc
- MPLCONFIGDIR=. PYTHONPATH=. nosetests-"${EPYTHON}" || die
+ MPLCONFIGDIR=. nosetests -v skimage || die
}