diff --git a/sci-libs/scikits_image/ChangeLog b/sci-libs/scikits_image/ChangeLog index 6120749..5227966 100644 --- a/sci-libs/scikits_image/ChangeLog +++ b/sci-libs/scikits_image/ChangeLog @@ -1,3 +1,7 @@ + 10 Apr 2020; -scikits_image-0.14.2.ebuild, + scikits_image-0.16.2.ebuild: + sci-libs/scikits_image: version bump 0.16.2 ahead of Gentoo Main + *scikits_image-0.16.2 (24 Jan 2020) 24 Jan 2020; +scikits_image-0.16.2.ebuild: diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest index ef23e15..296340f 100644 --- a/sci-libs/scikits_image/Manifest +++ b/sci-libs/scikits_image/Manifest @@ -1,3 +1,2 @@ -DIST scikit-image-0.14.2.tar.gz 27785514 SHA256 1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f SHA512 ab31fdb5b1d16b794ccc4d673f6c8bce0a8a54b81c0e43c9a4cdd5eb0465ef69ac184a06e395a1d27da51c2e0911db9afa2be4e740f44bceab952428eb7f599a WHIRLPOOL 9be56b58bff3b6d4706a907fedb5c5545e31630e49f9f5a8d0adf9afbabf63076694313b79904065331e552311278f64e3a49ff47540af1b2b3867e2c65d417f DIST scikit-image-0.14.3.tar.gz 27312311 SHA256 f05eab2df885fb6fde3df0e4d24c9c620d6474ea0eb949fd45f6f634925dd514 SHA512 7c3a09004eeb0f075532c38d14f8b402491c39a4ca56bc68aea17804756f5907f01cba4d1b8b45e1c20d1b233b84564015cf9f4124b1f5a19e103120c2466a2f WHIRLPOOL de0f2520e28b2e44db109b1a09229b8330584eb9162f5000c3c96098f523aa30ba381162cc67c1851ca1a67aafa002878e5271fc9d3173268451763dd56643bc DIST scikit-image-0.16.2.tar.gz 28945695 SHA256 dd7fbd32da74d4e9967dc15845f731f16e7966cee61f5dc0e12e2abb1305068c SHA512 55393f90a00488bb177600db1a6479a297d9b73f3e9bdbaa59fdb3a3a862c50f6d35a33b4e8a1923cf3dc8bc78ab800c628824bb53fb045f4d518ad1b3a796c4 WHIRLPOOL 39d1a7d7b19a1d45002a0681a1c40d5ecb66bfb2f468850fa1a119157a69284ad02c6d5b28b3e64fc54512053033579b388febb3783e0c1b2ca218c94235cf6d diff --git a/sci-libs/scikits_image/scikits_image-0.14.2.ebuild b/sci-libs/scikits_image/scikits_image-0.14.2.ebuild deleted file mode 100644 index e98dba1..0000000 --- a/sci-libs/scikits_image/scikits_image-0.14.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit distutils-r1 eutils virtualx - -MYPN="${PN/scikits_/scikit-}" -MYP="${MYPN}-${PV}" - -DESCRIPTION="Image processing routines for SciPy" -HOMEPAGE="https://scikit-image.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc freeimage pyamg test" - -RDEPEND=" - dev-python/cloudpickle[${PYTHON_USEDEP}] - dev-python/dask[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pywavelets[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - sci-libs/scipy[sparse,${PYTHON_USEDEP}] - freeimage? ( media-libs/freeimage ) - pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - >=dev-python/cython-0.23[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MYP}" - -DOCS=( CONTRIBUTORS.txt RELEASE.txt TODO.txt ) - -# Fails on Gentoo -#RESTRICT="test" - -python_prepare_all() { - # Remove pip dependency - sed -i '1iimport os.path as osp'\ - skimage/__init__.py\ - skimage/data/__init__.py\ - || die - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - #cd "${TEST_DIR}" || die "no ${TEST_DIR} available" - echo "backend : Agg" > matplotlibrc || die - #echo "backend.qt4 : PyQt4" >> matplotlibrc || die - #echo "backend.qt4 : PySide" >> matplotlibrc || die - mkdir "${WORKDIR}/empty_test_dir" || die - cd "${WORKDIR}/empty_test_dir" || die - pytest --pyargs skimage || die - #pytest -vv || die -} - -pkg_postinst() { - optfeature "FITS io capability" dev-python/astropy - optfeature "GTK" dev-python/pygtk - # not in portage yet - #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 -} diff --git a/sci-libs/scikits_image/scikits_image-0.16.2.ebuild b/sci-libs/scikits_image/scikits_image-0.16.2.ebuild index 7f6cb17..b8631a5 100644 --- a/sci-libs/scikits_image/scikits_image-0.16.2.ebuild +++ b/sci-libs/scikits_image/scikits_image-0.16.2.ebuild @@ -58,8 +58,8 @@ python_test() { echo "backend : Agg" > matplotlibrc || die #echo "backend.qt4 : PyQt4" >> matplotlibrc || die #echo "backend.qt4 : PySide" >> matplotlibrc || die - mkdir "${WORKDIR}/empty_test_dir" || die - cd "${WORKDIR}/empty_test_dir" || die + mkdir "${WORKDIR}/../empty_test_dir" || die + cd "${WORKDIR}/../empty_test_dir" || die pytest --pyargs skimage || die }