From fb8556202e7e7096dd62eb10b5246ff18bbff49b Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 23 Oct 2015 11:22:57 +0200 Subject: dev-python/astropy: Version Bump * Replace broken version * fix test calls regarding upstream recommendations Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher --- dev-python/astropy/Manifest | 2 +- dev-python/astropy/astropy-1.0.4.ebuild | 5 +- dev-python/astropy/astropy-1.0.5.ebuild | 89 --------------------------------- dev-python/astropy/astropy-1.0.6.ebuild | 89 +++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 93 deletions(-) delete mode 100644 dev-python/astropy/astropy-1.0.5.ebuild create mode 100644 dev-python/astropy/astropy-1.0.6.ebuild diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest index 4defe46d4ee8..461d0b29b06c 100644 --- a/dev-python/astropy/Manifest +++ b/dev-python/astropy/Manifest @@ -1,2 +1,2 @@ DIST astropy-1.0.4.tar.gz 7693852 SHA256 c64be72f3246ef699d2e0627a757afc0d59701fc9533088a8be0de23e16595a9 SHA512 5f66f61c93ad88afd2f24fedf96d553688de3c9f2a926dca9b1037ff24b4fd83bd486b870a0abf3c9810ad4e3e902c64f8dfb7f023363d0677e233a21667dfcc WHIRLPOOL ab10edec3650cc39d82e0f023ab107e5b23e75a03cbf8e24b0e902f3700c78921f86983f89ff533c56d9f4bc3b9d0109d8ee57cd6450ab239845b8a403bc5c26 -DIST astropy-1.0.5.tar.gz 7641836 SHA256 701b7bfef0ab99a2b9d5c4796eb7021d7bbdac19b60ff244c5428e3ea78177d4 SHA512 fe0e34db1719b9659fc10f453c619d00174fd34956299c14a76dc6497ab83aa0276e21ab9122b38edea3e31583b75575573062bbd20c17d349dbb4d1c0362716 WHIRLPOOL 4d699f4f3f3ff1cdbc149985e2a0fc92e16180c64efee95ca68f7c870d6841421bc4d9709fada1a73e7753ac1528ea84a7a619e76cb952a41a538b786c2ee014 +DIST astropy-1.0.6.tar.gz 7632331 SHA256 1a0190ad420323b9bd8f7b29995a39580d7d59c5329c825bb5abb52e2f7b936d SHA512 84e02204bc55d3bd6e0e891dc56ab218d1deb65882d5d771b3f80c2a11790f77c103b0c0d5537f1842d98f0d3ded19039c82482c15147edadac89e9707537b40 WHIRLPOOL b20e5c2e3677485eaf22c71c7e3461443d4a92bf7b0e649f5e0153e0b1d46741958e983b743aa30bf07ad971a0c865e53211963653ddf814a5d4362f36f07b02 diff --git a/dev-python/astropy/astropy-1.0.4.ebuild b/dev-python/astropy/astropy-1.0.4.ebuild index 5c4a30ecb102..a9ca39d03ede 100644 --- a/dev-python/astropy/astropy-1.0.4.ebuild +++ b/dev-python/astropy/astropy-1.0.4.ebuild @@ -18,10 +18,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc test" RDEPEND=" - !dev-python/pyfits >=dev-libs/expat-2.1.0:0= dev-python/configobj[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] + =sci-astronomy/erfa-1.2:0= @@ -76,7 +75,7 @@ python_compile_all() { } python_test() { - py.test -vv -k "not test_web_profile" astropy || die + esetup.py test } python_install_all() { diff --git a/dev-python/astropy/astropy-1.0.5.ebuild b/dev-python/astropy/astropy-1.0.5.ebuild deleted file mode 100644 index 8b93665a1a94..000000000000 --- a/dev-python/astropy/astropy-1.0.5.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) - -inherit distutils-r1 - -DESCRIPTION="Core functionality for performing astrophysics with Python" -HOMEPAGE="http://astropy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc test" - -RDEPEND=" - >=dev-libs/expat-2.1.0:0= - dev-python/configobj[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=sci-astronomy/erfa-1.2:0= - >=sci-astronomy/wcslib-4.25:0= - >=sci-libs/cfitsio-3.350:0= - sys-libs/zlib:0=" -DEPEND="${RDEPEND} - dev-python/astropy-helpers[${PYTHON_USEDEP}] - dev-python/cython[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - virtual/pkgconfig - doc? ( - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - media-gfx/graphviz - ) - test? ( - dev-libs/libxml2[${PYTHON_USEDEP}] - dev-python/h5py[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - )" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.4-disable_helper.patch" - "${FILESDIR}/${PN}-1.0.4-system-six.patch" - "${FILESDIR}/${PN}-1.0.4-system-pytest.patch" - "${FILESDIR}/${PN}-1.0.4-system-configobj.patch" - ) - -python_prepare_all() { - export mydistutilsargs="--offline" - rm -r ${PN}_helpers || die - cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die - rm -r cextern/{expat,erfa,cfitsio,wcslib} || die - #rm -rvf ${PN}/extern/* || die - #{configobj,{six,pytest,configobj}.py} || die - - cat >> setup.cfg <<-EOF - - [build] - use_system_libraries=1 - EOF - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - python_export_best - VARTEXFONTS="${T}"/fonts \ - MPLCONFIGDIR="${BUILD_DIR}" \ - PYTHONPATH="${BUILD_DIR}"/lib \ - esetup.py build_sphinx - fi -} - -python_test() { - py.test -vv -k "not test_web_profile" astropy || die -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/astropy/astropy-1.0.6.ebuild b/dev-python/astropy/astropy-1.0.6.ebuild new file mode 100644 index 000000000000..b5ae9cda3042 --- /dev/null +++ b/dev-python/astropy/astropy-1.0.6.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Core functionality for performing astrophysics with Python" +HOMEPAGE="http://astropy.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc test" + +RDEPEND=" + >=dev-libs/expat-2.1.0:0= + dev-python/configobj[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/ply[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=sci-astronomy/erfa-1.2:0= + >=sci-astronomy/wcslib-4.25:0= + >=sci-libs/cfitsio-3.350:0= + sys-libs/zlib:0=" +DEPEND="${RDEPEND} + dev-python/astropy-helpers[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + virtual/pkgconfig + doc? ( + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + media-gfx/graphviz + ) + test? ( + dev-libs/libxml2[${PYTHON_USEDEP}] + dev-python/h5py[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.4-disable_helper.patch" + "${FILESDIR}/${PN}-1.0.4-system-six.patch" + "${FILESDIR}/${PN}-1.0.4-system-pytest.patch" + "${FILESDIR}/${PN}-1.0.4-system-configobj.patch" + ) + +python_prepare_all() { + export mydistutilsargs="--offline" + rm -r ${PN}_helpers || die + cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die + rm -r cextern/{expat,erfa,cfitsio,wcslib} || die + #rm -rvf ${PN}/extern/* || die + #{configobj,{six,pytest,configobj}.py} || die + + cat >> setup.cfg <<-EOF + + [build] + use_system_libraries=1 + EOF + + distutils-r1_python_prepare_all +} + +python_compile_all() { + if use doc; then + python_export_best + VARTEXFONTS="${T}"/fonts \ + MPLCONFIGDIR="${BUILD_DIR}" \ + PYTHONPATH="${BUILD_DIR}"/lib \ + esetup.py build_sphinx + fi +} + +python_test() { + esetup.py test +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + distutils-r1_python_install_all +} -- cgit v1.2.3-65-gdbad