From: Kacper Kowalik Date: Fri, 6 Jan 2012 16:54:11 +0000 (+0000) Subject: Version bump with Python3 support. Claim for sci-astronomy X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a59ade0d09431d8f78ef7a1b9d4f4a37fd63c2d;p=gentoo.git Version bump with Python3 support. Claim for sci-astronomy Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/dev-python/pyfits/ChangeLog b/dev-python/pyfits/ChangeLog index d251ee8a0746..114e849d0778 100644 --- a/dev-python/pyfits/ChangeLog +++ b/dev-python/pyfits/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/pyfits -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.25 2011/03/22 10:54:02 arfrever Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/ChangeLog,v 1.26 2012/01/06 16:54:11 xarthisius Exp $ + +*pyfits-3.0.4 (06 Jan 2012) + + 06 Jan 2012; Kacper Kowalik + +files/pyfits-3.0.4-tests_python3.patch, +pyfits-3.0.4.ebuild, metadata.xml: + Version bump with Python3 support. Claim for sci-astronomy 22 Mar 2011; Arfrever Frehtes Taifersar Arahesis -pyfits-2.3.1.ebuild: diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest index 53f33ee8a3b8..b9338338c2f8 100644 --- a/dev-python/pyfits/Manifest +++ b/dev-python/pyfits/Manifest @@ -1,14 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX pyfits-3.0.4-tests_python3.patch 4264 RMD160 83e10cf47c43892393d26f88342e0b5a3d2214d0 SHA1 db5ab1f254d026f0d547feef1dd31c17639ba379 SHA256 22a1f12a2a2da82e778daaea9ca5fa9fab7e46f0aa2baaa311fb91daff897107 DIST pyfits-2.4.0.tar.gz 284236 RMD160 3256f2111db7c994f1deb7d6ec37cb6a2a003fb0 SHA1 5a0c9c7fd058fc44a22f1c00682461ecf4ebc3c1 SHA256 40c21106b86ad01264780409ecb2c8102e80c3eaf2085224f370fc7b3b07ea22 +DIST pyfits-3.0.4.tar.gz 656737 RMD160 5e0114a9abede5e4ba960c5edf7fe3f2d71d0cb9 SHA1 e2775d0a8610a9921e3609e36be9d049fe912388 SHA256 fd8fbf89727a0e5d7aa38a83a408b120cb0e590de2afa7ceac699e0c4a6e57dc EBUILD pyfits-2.4.0.ebuild 935 RMD160 bc2824746f4a02d9f08c7e104085e539ff865cc9 SHA1 5edc02c0b5e5dbfec03b470c891535d200ae84bf SHA256 7144b874e43a8dc362ef0ef8e3d2fa2fffd0301ef05a3a4169b227a8957c3a6a -MISC ChangeLog 3403 RMD160 8b5f5d01802eb916782ddc8dfd71c2ca635bfce7 SHA1 7bc5f31c077702d39e0069cadd4da525a543380f SHA256 2110de3d840887e2042610b8a7c8b9b9716c68e9e8144b128822c575cdfd53e0 -MISC metadata.xml 354 RMD160 053d6f1eae70e1a95a3b1303893ead6972a9d1a6 SHA1 00dcd2dc8abe7a318a8bb44e47e311ca3c5b359a SHA256 cb5af1a0d2887243322d952f6ed549d0dff22238fd5c1d243d2a1883593a71b4 +EBUILD pyfits-3.0.4.ebuild 1133 RMD160 df31b268b7e5e74d6125b7371a154d7aac0e4072 SHA1 c4b0db64c78255f6faa548387629bb3666c13b27 SHA256 9027f90bcf5fb29ebd9b74a5937a4d0f3fdf6cec5e9ae959e23db5ab57848cdf +MISC ChangeLog 3629 RMD160 1824145a3cf65335130e3033b367c2dc46210d87 SHA1 9e10abdd015cc54b2dd32d64d0a407df0b211a62 SHA256 4f37bdb28c86ace555166bb4d59c16608dc9b92b13c8e8a14005970cfed2218a +MISC metadata.xml 381 RMD160 15ab223c8f3e1fb0469ccef795546b513f7b7453 SHA1 2310d9884fc69462140b5804e09b8c1678e5c866 SHA256 14ff9a9e76479cac11289300e38f95ab5c829653d15a23716c7e1dfa577c0f83 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4657AACgkQ1ycZbhPLE2BarwCgiQq4CY+D0LbBRSMrny8T2RaZ -fHEAmwT5bEBPlctQaKZW0DVVLZFBcWVq -=ZiQE +iQIcBAEBCAAGBQJPByc+AAoJEF0huFKJUZL5vksP/15sriWQF0SEpl+l/QBxqZHP +SULXvxzT9FRZc+f79B/xhEJ9YUh9H+BwC9iFCldsthJoUYRlFcof3P4jV/OjXKya +1gHUFtTKJhwCJjJG1mr29kPc6Ihgp8x6k2uIdLRBr7CGEbLboCMmqcsd6CxOW0Pw +DIZAYqDBSSCkUe8EgYZsorKKfZ8my32pCA+xNte2hOlt0JoLTX1AjFNdYFWL8T40 +yjoVVfoSOjpJs5T0OeVpTB5ip/2Vm2VI74tGTI2mMeYoX7hUn3bTUODE9uB3kgIF +Eas3mHOU9y0CIu1IZg+iDAdJqreqKQ0G/ydeoCcf7zSxaIyIzCUmJgHezhARIyvJ +OfQFVcvzPMcRiUTVjPqoyBd3JW8gerESbqv/p7EaENm4evcJ/Z660TKSmQEBO/gp +U4RE3CKcyyFsct9PGA8R4wbdIMe7Y4VaRhVldB55eqELWLfHFFeniOhQJhbmgW6/ +GEiVmfIc3vWQdbHon80T54LP8Jh2pOoWfYBzjaVZn34oFLGn5eiNpHECdNop3QCo +4d93j/DzEHo2ZmKfG9i5R3JPhZapOWhcR0wePJw9WSwaGFzv+blPFBkxnQcxuWtK +olPQMQDsD9KEJV8dBmm8TMcbgJFPUfGM+TIN0myLg+Utjqkm9fvt1HRieQwPXMxK +yzNL2DpOphrsj+wveE4k +=hahQ -----END PGP SIGNATURE----- diff --git a/dev-python/pyfits/files/pyfits-3.0.4-tests_python3.patch b/dev-python/pyfits/files/pyfits-3.0.4-tests_python3.patch new file mode 100644 index 000000000000..0138d5798f9a --- /dev/null +++ b/dev-python/pyfits/files/pyfits-3.0.4-tests_python3.patch @@ -0,0 +1,118 @@ +--- lib/pyfits/tests/test_division.py ++++ lib/pyfits/tests/test_division.py +@@ -1,7 +1,10 @@ + from __future__ import division # confidence high + from __future__ import with_statement + +-from cStringIO import StringIO ++try: ++ from cStringIO import StringIO ++except: ++ from io import StringIO + + import numpy as np + +--- lib/pyfits/tests/test_structured.py ++++ lib/pyfits/tests/test_structured.py +@@ -65,8 +65,8 @@ + st['f1'] = [1, 3, 5] + st['f2'] = ['hello', 'world', 'byebye'] + st['f3'] = np.random.random(st['f3'].shape) +- print st.dtype.descr +- print st ++ print(st.dtype.descr) ++ print(st) + + return st + +@@ -75,26 +75,26 @@ + def test_structured(self): + fname = self.data('stddata.fits') + +- print 'Reading from ', fname ++ print('Reading from ', fname) + data1, h1 = pyfits.getdata(fname, ext=1, header=True) + data2, h2 = pyfits.getdata(fname, ext=2, header=True) + + st = get_test_data() + + outfile = self.temp('test.fits') +- print 'Writing to file data1:', outfile ++ print('Writing to file data1:', outfile) + pyfits.writeto(outfile, data1, clobber=True) +- print 'Appending to file: data2', outfile ++ print('Appending to file: data2', outfile) + pyfits.append(outfile, data2) + +- print 'Appending to file: st', outfile ++ print('Appending to file: st', outfile) + pyfits.append(outfile, st) +- print st.dtype.descr +- print st ++ print(st.dtype.descr) ++ print(st) + assert st.dtype.isnative + assert np.all(st['f1'] == [1,3,5]) + +- print 'Reading data back' ++ print('Reading data back') + data1check, h1check = pyfits.getdata(outfile, ext=1, header=True) + data2check, h2check = pyfits.getdata(outfile, ext=2, header=True) + stcheck, sthcheck = pyfits.getdata(outfile, ext=3, header=True) +@@ -103,12 +103,12 @@ + raise ValueError('Fail') + if not compare_arrays(data2, data2check, verbose=True): + raise ValueError('Fail') +- print st, stcheck ++ print(st, stcheck) + if not compare_arrays(st, stcheck, verbose=True): + raise ValueError('Fail') + + # try reading with view +- print 'Reading with ndarray view' ++ print('Reading with ndarray view') + dataviewcheck, hviewcheck = pyfits.getdata(outfile, ext=2, header=True, + view=np.ndarray) + if not compare_arrays(data2, dataviewcheck, verbose=True): +--- lib/pyfits/tests/test_table.py ++++ lib/pyfits/tests/test_table.py +@@ -51,7 +51,7 @@ + nfieldsa = len(a.dtype.names) + nfieldsb = len(b.dtype.names) + if nfieldsa != nfieldsb: +- print "number of fields don't match" ++ print("number of fields don't match") + return False + for i in range(nfieldsa): + fielda = a.field(i) +@@ -63,21 +63,21 @@ + if (type(fielda) != type(fieldb) and not + (issubclass(type(fielda), type(fieldb)) or + issubclass(type(fieldb), type(fielda)))): +- print "type(fielda): ",type(fielda)," fielda: ",fielda +- print "type(fieldb): ",type(fieldb)," fieldb: ",fieldb +- print 'field %d type differs' % i ++ print("type(fielda): ",type(fielda)," fielda: ",fielda) ++ print("type(fieldb): ",type(fieldb)," fieldb: ",fieldb) ++ print('field %d type differs' % i) + return False + if isinstance(fielda[0], np.floating): + if not comparefloats(fielda, fieldb): +- print "fielda: ",fielda +- print "fieldb: ",fieldb +- print 'field %d differs' % i ++ print("fielda: ",fielda) ++ print("fieldb: ",fieldb) ++ print('field %d differs' % i) + return False + else: + if np.any(fielda != fieldb): +- print "fielda: ",fielda +- print "fieldb: ",fieldb +- print 'field %d differs' % i ++ print("fielda: ",fielda) ++ print("fieldb: ",fieldb) ++ print('field %d differs' % i) + return False + return True + diff --git a/dev-python/pyfits/metadata.xml b/dev-python/pyfits/metadata.xml index b44353fe734c..fa8abffa4853 100644 --- a/dev-python/pyfits/metadata.xml +++ b/dev-python/pyfits/metadata.xml @@ -1,6 +1,7 @@ +sci-astronomy python PyFITS provides an interface to FITS formatted files under the diff --git a/dev-python/pyfits/pyfits-3.0.4.ebuild b/dev-python/pyfits/pyfits-3.0.4.ebuild new file mode 100644 index 000000000000..a4d84aa3fda5 --- /dev/null +++ b/dev-python/pyfits/pyfits-3.0.4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.0.4.ebuild,v 1.1 2012/01/06 16:54:11 xarthisius Exp $ + +EAPI=4 +SUPPORT_PYTHON_ABIS="1" +PYTHON_DEPEND="*:2.6" + +inherit distutils eutils + +DESCRIPTION="Provides an interface to FITS formatted files under python" +HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits http://pypi.python.org/pypi/pyfits" +SRC_URI="http://pypi.python.org/packages/source/p/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="test" + +RDEPEND="dev-python/numpy" +DEPEND="${RDEPEND} + test? ( dev-python/nose )" + +src_prepare() { + sed -e 's/Exception, e/Exception as e/g' \ + -i lib/pyfits/{hdu/base.py,_release.py,tests/test_core.py} || die + epatch "${FILESDIR}"/${P}-tests_python3.patch + distutils_src_prepare +} + +src_test() { + testing() { + local t + for t in lib/${PN}/tests/test_*.py; do + PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" "${t}" || die "${t} failed with Python ${PYTHON_ABI}" + done + } + python_execute_function testing +}