From 696cb4de37c41abe2fd0144e97c6226f5127f164 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Thu, 15 Oct 2009 23:38:14 +0000 Subject: Version bump. (Portage version: 14609-svn/cvs/Linux x86_64) --- dev-python/pyfits/ChangeLog | 9 ++++- .../pyfits/files/pyfits-1.3-test-table.patch | 40 ---------------------- dev-python/pyfits/pyfits-1.3.ebuild | 39 --------------------- dev-python/pyfits/pyfits-2.2.2.ebuild | 33 ++++++++++++++++++ dev-python/pyfits/pyfits-2.2.ebuild | 35 ------------------- 5 files changed, 41 insertions(+), 115 deletions(-) delete mode 100644 dev-python/pyfits/files/pyfits-1.3-test-table.patch delete mode 100644 dev-python/pyfits/pyfits-1.3.ebuild create mode 100644 dev-python/pyfits/pyfits-2.2.2.ebuild delete mode 100644 dev-python/pyfits/pyfits-2.2.ebuild (limited to 'dev-python/pyfits') diff --git a/dev-python/pyfits/ChangeLog b/dev-python/pyfits/ChangeLog index f46e756f56d7..de70d77cb3e1 100644 --- a/dev-python/pyfits/ChangeLog +++ b/dev-python/pyfits/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pyfits # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.12 2009/10/15 13:32:48 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.13 2009/10/15 23:38:13 arfrever Exp $ + +*pyfits-2.2.2 (15 Oct 2009) + + 15 Oct 2009; Arfrever Frehtes Taifersar Arahesis + -pyfits-1.3.ebuild, -files/pyfits-1.3-test-table.patch, + -pyfits-2.2.ebuild, +pyfits-2.2.2.ebuild: + Version bump. 15 Oct 2009; Markus Meier pyfits-2.1.1.ebuild: amd64/x86 stable, bug #288111 diff --git a/dev-python/pyfits/files/pyfits-1.3-test-table.patch b/dev-python/pyfits/files/pyfits-1.3-test-table.patch deleted file mode 100644 index bb76ea840237..000000000000 --- a/dev-python/pyfits/files/pyfits-1.3-test-table.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- pyfits-1.3/test/testPyfitsTable.py.orig 2007-12-18 19:10:29.000000000 +0000 -+++ pyfits-1.3/test/testPyfitsTable.py 2008-05-22 17:11:12.000000000 +0100 -@@ -128,7 +128,7 @@ - # the table HDU's data is a subclass of a record array, so we can access - # one row like this: - -- self.assertEqual(str(tbhdu.data[1]),"('def', 12.0, 4, 2, (4.0+4.0j), array([ True], dtype=bool), 102, array([False, True, True, True, True, False, False, False, False,\n True, False], dtype=bool))") -+ self.assertEqual(str(tbhdu.data[1]),"('def', 12.0, 4, 2, (4+4j), array([ True], dtype=bool), 102, array([False, True, True, True, True, False, False, False, False,\n True, False], dtype=bool))") - - # and a column like this: - self.assertEqual(str(tbhdu.data.field('abc')),"['abc' 'def' 'xx']") -@@ -306,11 +306,25 @@ - formats='int16,a20,float32,a10',\ - names='order,name,mag,Sp') - hdu=pyfits.new_table(bright,nrows=2,tbtype='TableHDU') -- s="[(1, 'Serius', -1.45, 'A1V') (2, 'Canopys', -0.73000002, 'F0Ib')]" -- self.assertEqual(str(hdu.data[:]),s) -+ self.assertEqual(hdu.data.field(0).all(), -+ num.array([1,2],dtype=num.int16).all()) -+ self.assertEqual(hdu.data[0][1],'Serius') -+ self.assertEqual(hdu.data[1][1],'Canopys') -+ self.assertEqual(hdu.data.field(2).all(), -+ num.array([-1.45,-0.73],dtype=num.float32).all()) -+ self.assertEqual(hdu.data[0][3],'A1V') -+ self.assertEqual(hdu.data[1][3],'F0Ib') - hdu.writeto('toto.fits', clobber=True) - hdul = pyfits.open('toto.fits') -- self.assertEqual(str(hdul[1].data[:]),s) -+ self.assertEqual(hdul[1].data.field(0).all(), -+ num.array([1,2],dtype=num.int16).all()) -+ self.assertEqual(hdul[1].data[0][1],'Serius') -+ self.assertEqual(hdul[1].data[1][1],'Canopys') -+ self.assertEqual(hdul[1].data.field(2).all(), -+ num.array([-1.45,-0.73],dtype=num.float32).all()) -+ self.assertEqual(hdul[1].data[0][3],'A1V') -+ self.assertEqual(hdul[1].data[1][3],'F0Ib') -+ - os.remove('toto.fits') - hdu=pyfits.new_table(bright,nrows=2) - tmp=pyfits.rec.array([(1,'Serius',-1.45,'A1V'),\ diff --git a/dev-python/pyfits/pyfits-1.3.ebuild b/dev-python/pyfits/pyfits-1.3.ebuild deleted file mode 100644 index ce59eca80d3d..000000000000 --- a/dev-python/pyfits/pyfits-1.3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-1.3.ebuild,v 1.3 2008/05/23 21:04:18 maekke Exp $ - -NEED_PYTHON=2.3 -inherit distutils eutils - -DESCRIPTION="Provides an interface to FITS formatted files under python" -SRC_URI="http://www.stsci.edu/resources/software_hardware/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits" - -RDEPEND="dev-python/numpy" -DEPEND="test? ( dev-python/numpy )" - -IUSE="doc test" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-fbsd" -LICENSE="AURA" - -src_unpack() { - unpack ${A} - # fix test in binary table (should be fixed in >1.3) - epatch "${FILESDIR}"/${P}-test-table.patch -} - -src_test() { - cd "${S}"/test - for t in test*.py; do - PYTHONPATH="${S}"/build/lib ${python} ${t} || die "test ${t} failed" - done -} - -src_install() { - distutils_src_install - if use doc; then - insinto /usr/share/doc/${PF} - doins docs/Users_Manual.pdf || die - fi -} diff --git a/dev-python/pyfits/pyfits-2.2.2.ebuild b/dev-python/pyfits/pyfits-2.2.2.ebuild new file mode 100644 index 000000000000..3d1609ddba9d --- /dev/null +++ b/dev-python/pyfits/pyfits-2.2.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-2.2.2.ebuild,v 1.1 2009/10/15 23:38:13 arfrever Exp $ + +EAPI="2" +SUPPORT_PYTHON_ABIS="1" + +inherit distutils + +DESCRIPTION="Provides an interface to FITS formatted files under python" +SRC_URI="http://www.stsci.edu/resources/software_hardware/${PN}/${P}.tar.gz" +HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits" + +IUSE="" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +LICENSE="AURA" + +RDEPEND="dev-python/numpy" +DEPEND="${RDEPEND}" +RESTRICT_PYTHON_ABIS="3.*" + +src_test() { + cd "${S}/test" + + testing() { + local test + for test in test*.py; do + PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib*)" "$(PYTHON)" "${test}" || die "test ${test} failed with Python ${PYTHON_ABI}" + done + } + python_execute_function testing +} diff --git a/dev-python/pyfits/pyfits-2.2.ebuild b/dev-python/pyfits/pyfits-2.2.ebuild deleted file mode 100644 index 55ef3bc42c89..000000000000 --- a/dev-python/pyfits/pyfits-2.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-2.2.ebuild,v 1.1 2009/09/30 19:42:40 bicatali Exp $ - -EAPI="2" - -NEED_PYTHON="2.3" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -DESCRIPTION="Provides an interface to FITS formatted files under python" -SRC_URI="http://www.stsci.edu/resources/software_hardware/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits" - -IUSE="" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" -LICENSE="AURA" - -RDEPEND="dev-python/numpy" -DEPEND="${RDEPEND}" -RESTRICT_PYTHON_ABIS="3.*" - -src_test() { - cd "${S}/test" - - testing() { - local test - for test in test*.py; do - PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib*)" "$(PYTHON)" "${test}" || die "test ${test} failed" - done - } - python_execute_function testing -} -- cgit v1.2.3-65-gdbad