* [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/
@ 2013-07-26 16:14 Nicolas Bock
0 siblings, 0 replies; 8+ messages in thread
From: Nicolas Bock @ 2013-07-26 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 18521f0900639bc29f20e968df09441efdb4ab37
Author: Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Jul 26 02:09:15 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Fri Jul 26 02:09:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=18521f09
Removed lines previously needed for esetup.py
---
sci-libs/scikits_image/scikits_image-9999.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sci-libs/scikits_image/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index 9515834..46a02c1 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -42,9 +42,7 @@ S="${WORKDIR}/${MYPN}-${PV}"
DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt )
python_test() {
- distutils_install_for_testing.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile || die "install test failed"
+ distutils_install_for_testing.py
cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
echo "backend: Agg" > matplotlibrc
MPLCONFIGDIR=. PYTHONPATH=. nosetests-"${EPYTHON}" || die
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/
@ 2013-08-19 23:33 Sebastien Fabbro
0 siblings, 0 replies; 8+ messages in thread
From: Sebastien Fabbro @ 2013-08-19 23:33 UTC (permalink / raw
To: gentoo-commits
commit: ffa98a650ac85a5ba8ba8133d7eba6d38c4ddf03
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 23:19:01 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 23:19:01 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ffa98a65
sci-libs/scikits_image: Revert to esetup.py instead of for testing, remove scikits depedency
Package-Manager: portage-2.2.01.22288-prefix
RepoMan-Options: --force
---
sci-libs/scikits_image/ChangeLog | 7 +++++++
sci-libs/scikits_image/scikits_image-9999.ebuild | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
new file mode 100644
index 0000000..249a0b6
--- /dev/null
+++ b/sci-libs/scikits_image/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-libs/scikits_image
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 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/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index 46a02c1..6174f06 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -22,7 +22,6 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc freeimage gtk qt4 test"
RDEPEND="
- sci-libs/scikits[${PYTHON_USEDEP}]
sci-libs/scipy[sparse,${PYTHON_USEDEP}]
freeimage? ( media-libs/freeimage )
gtk? ( dev-python/pygtk[$(python_gen_usedep 'python2*')] )
@@ -42,7 +41,10 @@ S="${WORKDIR}/${MYPN}-${PV}"
DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt )
python_test() {
- distutils_install_for_testing.py
+ 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/
@ 2013-09-17 17:24 Sebastien Fabbro
0 siblings, 0 replies; 8+ messages in thread
From: Sebastien Fabbro @ 2013-09-17 17:24 UTC (permalink / raw
To: gentoo-commits
commit: fda78b0df21eeb3f200753dc5f3b30a5d1f77387
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 17:23:44 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 17:23:44 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fda78b0d
sci-libs/scikits_image: Fix source directory, update dependencies, cleanup (bug #484428)
Package-Manager: portage-2.2.4.22351-prefix
RepoMan-Options: --force
---
sci-libs/scikits_image/ChangeLog | 5 +++++
sci-libs/scikits_image/metadata.xml | 17 +++++++++++++++++
sci-libs/scikits_image/scikits_image-9999.ebuild | 18 +++++++-----------
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 249a0b6..2b3abdf 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 0000000..51476ec
--- /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 6174f06..bcb232c 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
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/
@ 2013-09-20 9:46 Justin Lecher
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2013-09-20 9:46 UTC (permalink / raw
To: gentoo-commits
commit: 8e9360c068b61c4747fc4bd25a80f618fb1d354a
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 09:45:53 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 09:46:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8e9360c0
sci-libs/scikits_image: Merge tree changes
Package-Manager: portage-2.2.6
---
sci-libs/scikits_image/ChangeLog | 3 +++
sci-libs/scikits_image/scikits_image-9999.ebuild | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 9e459b7..116468d 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild:
+ Merge tree changes
+
18 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild,
metadata.xml:
Drop KEYWORDS from live ebuild
diff --git a/sci-libs/scikits_image/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index 198557b..ebedf7b 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -40,8 +40,8 @@ python_test() {
# distutils_install_for_testing not working here
esetup.py \
install --root="${T}/test-${EPYTHON}" \
- --no-compile || die "install test failed"
+ --no-compile
cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
- echo "backend: Agg" > matplotlibrc
+ echo "backend: Agg" > matplotlibrc || die
MPLCONFIGDIR=. nosetests -v skimage || die
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/
@ 2013-09-20 9:46 Justin Lecher
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2013-09-20 9:46 UTC (permalink / raw
To: gentoo-commits
commit: 699fb984a530ada44d1dfa3b792d09dc8f96ed3c
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 06:57:57 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 09:46:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=699fb984
sci-libs/scikits_image: Drop KEYWORDS from live ebuild
Package-Manager: portage-2.2.6
---
sci-libs/scikits_image/ChangeLog | 4 ++++
sci-libs/scikits_image/metadata.xml | 16 ++++++++--------
sci-libs/scikits_image/scikits_image-9999.ebuild | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 2b3abdf..9e459b7 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild,
+ metadata.xml:
+ Drop KEYWORDS from live ebuild
+
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
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index 51476ec..4e57c7f 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -1,17 +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">
+ <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>
+ <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 bcb232c..198557b 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://github.com/scikit-image/scikit-image.git"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
IUSE="doc freeimage gtk qt4 test"
RDEPEND="
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/
@ 2013-09-20 9:48 Justin Lecher
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2013-09-20 9:48 UTC (permalink / raw
To: gentoo-commits
commit: 21d36d1ed0fe67c528ab433735f7f48c1c630565
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 06:57:57 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 09:46:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=21d36d1e
sci-libs/scikits_image: Drop KEYWORDS from live ebuild
Package-Manager: portage-2.2.6
---
sci-libs/scikits_image/ChangeLog | 4 ++++
sci-libs/scikits_image/metadata.xml | 16 ++++++++--------
sci-libs/scikits_image/scikits_image-9999.ebuild | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 2b3abdf..9e459b7 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild,
+ metadata.xml:
+ Drop KEYWORDS from live ebuild
+
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
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index 51476ec..4e57c7f 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -1,17 +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">
+ <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>
+ <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 bcb232c..198557b 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://github.com/scikit-image/scikit-image.git"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
IUSE="doc freeimage gtk qt4 test"
RDEPEND="
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/
@ 2013-09-20 9:48 Justin Lecher
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2013-09-20 9:48 UTC (permalink / raw
To: gentoo-commits
commit: 6cb506f8ab8af731cac885a8cf0858781ad2cc76
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 09:45:53 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 09:46:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6cb506f8
sci-libs/scikits_image: Merge tree changes
Package-Manager: portage-2.2.6
---
sci-libs/scikits_image/ChangeLog | 3 +++
sci-libs/scikits_image/scikits_image-9999.ebuild | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog
index 9e459b7..116468d 100644
--- a/sci-libs/scikits_image/ChangeLog
+++ b/sci-libs/scikits_image/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild:
+ Merge tree changes
+
18 Sep 2013; Justin Lecher <jlec@gentoo.org> scikits_image-9999.ebuild,
metadata.xml:
Drop KEYWORDS from live ebuild
diff --git a/sci-libs/scikits_image/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index 198557b..ebedf7b 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -40,8 +40,8 @@ python_test() {
# distutils_install_for_testing not working here
esetup.py \
install --root="${T}/test-${EPYTHON}" \
- --no-compile || die "install test failed"
+ --no-compile
cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
- echo "backend: Agg" > matplotlibrc
+ echo "backend: Agg" > matplotlibrc || die
MPLCONFIGDIR=. nosetests -v skimage || die
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/
@ 2015-11-06 16:22 Justin Lecher
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2015-11-06 16:22 UTC (permalink / raw
To: gentoo-commits
commit: a31d5f1e40b29d56f1761f95c42d4c9c993687a4
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 16:21:57 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Nov 6 16:21:57 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a31d5f1e
sci-libs/scikits_image: Adopt to latest HEAD
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/scikits_image/metadata.xml | 4 ++-
sci-libs/scikits_image/scikits_image-9999.ebuild | 46 +++++++++++++-----------
2 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index 4e57c7f..b9bd049 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -9,7 +9,9 @@
algorithms and applications.
</longdescription>
<use>
- <flag name="freeimage">Enable support for image i/o via <pkg>media-libs/freeimage</pkg></flag>
+ <flag name="freeimage">Enable support for image i/o via
+ <pkg>media-libs/freeimage</pkg></flag>
+ <flag name="pyamg">Enable support for algebraic solvers via <pkg>dev-python/pyamg</pkg></flag>
</use>
<upstream>
<remote-id type="pypi">scikit-image</remote-id>
diff --git a/sci-libs/scikits_image/scikits_image-9999.ebuild b/sci-libs/scikits_image/scikits_image-9999.ebuild
index 5d7fa65..4b52572 100644
--- a/sci-libs/scikits_image/scikits_image-9999.ebuild
+++ b/sci-libs/scikits_image/scikits_image-9999.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-# pyamg missing py3 support
-#PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
-inherit distutils-r1 git-r3
+inherit distutils-r1 eutils git-r3 virtualx
DESCRIPTION="Image processing routines for SciPy"
HOMEPAGE="http://scikit-image.org/"
@@ -17,31 +15,39 @@ EGIT_REPO_URI="https://github.com/scikit-image/scikit-image.git"
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
-IUSE="doc freeimage gtk qt4 test"
+IUSE="doc freeimage gtk pyamg qt4 test"
RDEPEND="
- sci-libs/scipy[sparse,${PYTHON_USEDEP}]
+ >=dev-python/matplotlib-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.6.1[${PYTHON_USEDEP}]
+ >=dev-python/pillow-1.7.8[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3[${PYTHON_USEDEP}]
+ >=sci-libs/scipy-0.9[sparse,${PYTHON_USEDEP}]
freeimage? ( media-libs/freeimage )
gtk? ( dev-python/pygtk[$(python_gen_usedep 'python2*')] )
+ pyamg? ( dev-python/pyamg[$(python_gen_usedep 'python2*')] )
qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
-DEPEND="
- >=dev-python/cython-0.17[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}
+ >=dev-python/cython-0.21[${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[sparse,${PYTHON_USEDEP}] )"
+ )"
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
- cd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die
- echo "backend: Agg" > matplotlibrc || die
- MPLCONFIGDIR=. nosetests -v skimage || die
+ distutils_install_for_testing
+ mkdir for_test && cd for_test || die
+ echo "backend : Agg" > matplotlibrc || die
+ echo "backend.qt4 : PyQt4" >> matplotlibrc || die
+ VIRTUALX_COMMAND=nosetests
+ MPLCONFIGDIR=. virtualmake --exe -v skimage || die
+}
+
+pkg_postinst() {
+ optfeature "FITS io capability" dev-python/astropy
+ #optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
+ #optfeature "io plugin providing most standard formats" dev-python/imread
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-11-06 16:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-20 9:46 [gentoo-commits] proj/sci:master commit in: sci-libs/scikits_image/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2015-11-06 16:22 Justin Lecher
2013-09-20 9:48 Justin Lecher
2013-09-20 9:48 Justin Lecher
2013-09-20 9:46 Justin Lecher
2013-09-17 17:24 Sebastien Fabbro
2013-08-19 23:33 Sebastien Fabbro
2013-07-26 16:14 Nicolas Bock
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox