* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyfits/files/, dev-python/pyfits/
@ 2016-11-17 20:15 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2016-11-17 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 5eaffd5066fca627b676845d14d7249e04ca7731
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 20:15:12 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 20:15:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eaffd50
dev-python/pyfits: add several patches from debian, also fixing #596240
Package-Manager: portage-2.3.2
dev-python/pyfits/files/01-system-cfitsio.patch | 176 +++++++++++++++++++++
.../files/02-numpy-deprecation-warning.patch | 24 +++
.../pyfits/files/03-fix-for-cfitsio-3380.patch | 43 +++++
.../{pyfits-3.4.ebuild => pyfits-3.4-r1.ebuild} | 11 +-
4 files changed, 249 insertions(+), 5 deletions(-)
diff --git a/dev-python/pyfits/files/01-system-cfitsio.patch b/dev-python/pyfits/files/01-system-cfitsio.patch
new file mode 100644
index 00000000..f2ce935
--- /dev/null
+++ b/dev-python/pyfits/files/01-system-cfitsio.patch
@@ -0,0 +1,176 @@
+From 70fe4dac3f68c3eed369d42e6a49e7865db8b250 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:31:01 -0700
+Subject: 01-system-cfitsio.diff
+
+Patch-Name: 01-system-cfitsio.diff
+---
+ setup.cfg | 145 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 73 insertions(+), 72 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 3a05c62..3a64f33 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -40,81 +40,81 @@ scripts =
+
+ [extension=pyfits.compression]
+ sources =
+- cextern/cfitsio/adler32.c
+- cextern/cfitsio/buffers.c
+- cextern/cfitsio/cfileio.c
+- cextern/cfitsio/checksum.c
+- cextern/cfitsio/crc32.c
+- cextern/cfitsio/deflate.c
+- cextern/cfitsio/drvrfile.c
+- cextern/cfitsio/drvrgsiftp.c
+- cextern/cfitsio/drvrmem.c
+- cextern/cfitsio/drvrnet.c
+- cextern/cfitsio/drvrsmem.c
+- cextern/cfitsio/editcol.c
+- cextern/cfitsio/edithdu.c
+- cextern/cfitsio/eval_f.c
+- cextern/cfitsio/eval_l.c
+- cextern/cfitsio/eval_y.c
+- cextern/cfitsio/fitscore.c
+- cextern/cfitsio/fits_hcompress.c
+- cextern/cfitsio/fits_hdecompress.c
+- cextern/cfitsio/getcolb.c
+- cextern/cfitsio/getcol.c
+- cextern/cfitsio/getcold.c
+- cextern/cfitsio/getcole.c
+- cextern/cfitsio/getcoli.c
+- cextern/cfitsio/getcolj.c
+- cextern/cfitsio/getcolk.c
+- cextern/cfitsio/getcoll.c
+- cextern/cfitsio/getcolsb.c
+- cextern/cfitsio/getcols.c
+- cextern/cfitsio/getcolui.c
+- cextern/cfitsio/getcoluj.c
+- cextern/cfitsio/getcoluk.c
+- cextern/cfitsio/getkey.c
+- cextern/cfitsio/group.c
+- cextern/cfitsio/grparser.c
+- cextern/cfitsio/histo.c
+- cextern/cfitsio/imcompress.c
+- cextern/cfitsio/infback.c
+- cextern/cfitsio/inffast.c
+- cextern/cfitsio/inflate.c
+- cextern/cfitsio/inftrees.c
+- cextern/cfitsio/iraffits.c
+- cextern/cfitsio/modkey.c
+- cextern/cfitsio/pliocomp.c
+- cextern/cfitsio/putcolb.c
+- cextern/cfitsio/putcol.c
+- cextern/cfitsio/putcold.c
+- cextern/cfitsio/putcole.c
+- cextern/cfitsio/putcoli.c
+- cextern/cfitsio/putcolj.c
+- cextern/cfitsio/putcolk.c
+- cextern/cfitsio/putcoll.c
+- cextern/cfitsio/putcolsb.c
+- cextern/cfitsio/putcols.c
+- cextern/cfitsio/putcolu.c
+- cextern/cfitsio/putcolui.c
+- cextern/cfitsio/putcoluj.c
+- cextern/cfitsio/putcoluk.c
+- cextern/cfitsio/putkey.c
+- cextern/cfitsio/quantize.c
+- cextern/cfitsio/region.c
+- cextern/cfitsio/ricecomp.c
+- cextern/cfitsio/scalnull.c
+- cextern/cfitsio/swapproc.c
+- cextern/cfitsio/trees.c
+- cextern/cfitsio/uncompr.c
+- cextern/cfitsio/wcssub.c
+- cextern/cfitsio/wcsutil.c
+- cextern/cfitsio/zcompress.c
+- cextern/cfitsio/zuncompress.c
+- cextern/cfitsio/zutil.c
++# cextern/cfitsio/adler32.c
++# cextern/cfitsio/buffers.c
++# cextern/cfitsio/cfileio.c
++# cextern/cfitsio/checksum.c
++# cextern/cfitsio/crc32.c
++# cextern/cfitsio/deflate.c
++# cextern/cfitsio/drvrfile.c
++# cextern/cfitsio/drvrgsiftp.c
++# cextern/cfitsio/drvrmem.c
++# cextern/cfitsio/drvrnet.c
++# cextern/cfitsio/drvrsmem.c
++# cextern/cfitsio/editcol.c
++# cextern/cfitsio/edithdu.c
++# cextern/cfitsio/eval_f.c
++# cextern/cfitsio/eval_l.c
++# cextern/cfitsio/eval_y.c
++# cextern/cfitsio/fitscore.c
++# cextern/cfitsio/fits_hcompress.c
++# cextern/cfitsio/fits_hdecompress.c
++# cextern/cfitsio/getcolb.c
++# cextern/cfitsio/getcol.c
++# cextern/cfitsio/getcold.c
++# cextern/cfitsio/getcole.c
++# cextern/cfitsio/getcoli.c
++# cextern/cfitsio/getcolj.c
++# cextern/cfitsio/getcolk.c
++# cextern/cfitsio/getcoll.c
++# cextern/cfitsio/getcolsb.c
++# cextern/cfitsio/getcols.c
++# cextern/cfitsio/getcolui.c
++# cextern/cfitsio/getcoluj.c
++# cextern/cfitsio/getcoluk.c
++# cextern/cfitsio/getkey.c
++# cextern/cfitsio/group.c
++# cextern/cfitsio/grparser.c
++# cextern/cfitsio/histo.c
++# cextern/cfitsio/imcompress.c
++# cextern/cfitsio/infback.c
++# cextern/cfitsio/inffast.c
++# cextern/cfitsio/inflate.c
++# cextern/cfitsio/inftrees.c
++# cextern/cfitsio/iraffits.c
++# cextern/cfitsio/modkey.c
++# cextern/cfitsio/pliocomp.c
++# cextern/cfitsio/putcolb.c
++# cextern/cfitsio/putcol.c
++# cextern/cfitsio/putcold.c
++# cextern/cfitsio/putcole.c
++# cextern/cfitsio/putcoli.c
++# cextern/cfitsio/putcolj.c
++# cextern/cfitsio/putcolk.c
++# cextern/cfitsio/putcoll.c
++# cextern/cfitsio/putcolsb.c
++# cextern/cfitsio/putcols.c
++# cextern/cfitsio/putcolu.c
++# cextern/cfitsio/putcolui.c
++# cextern/cfitsio/putcoluj.c
++# cextern/cfitsio/putcoluk.c
++# cextern/cfitsio/putkey.c
++# cextern/cfitsio/quantize.c
++# cextern/cfitsio/region.c
++# cextern/cfitsio/ricecomp.c
++# cextern/cfitsio/scalnull.c
++# cextern/cfitsio/swapproc.c
++# cextern/cfitsio/trees.c
++# cextern/cfitsio/uncompr.c
++# cextern/cfitsio/wcssub.c
++# cextern/cfitsio/wcsutil.c
++# cextern/cfitsio/zcompress.c
++# cextern/cfitsio/zuncompress.c
++# cextern/cfitsio/zutil.c
+ src/compressionmodule.c
+ include_dirs =
+ numpy
+- cextern/cfitsio
++# cextern/cfitsio
+ extra_compile_args =
+ -Wno-declaration-after-statement
+ -Wno-unused-variable
+@@ -125,6 +125,7 @@ extra_compile_args =
+ -Wno-unused
+ -Wno-comments
+ -Wno-switch
++libraries = cfitsio
+ optional = True
+ fail_message =
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/dev-python/pyfits/files/02-numpy-deprecation-warning.patch b/dev-python/pyfits/files/02-numpy-deprecation-warning.patch
new file mode 100644
index 00000000..026e6b8
--- /dev/null
+++ b/dev-python/pyfits/files/02-numpy-deprecation-warning.patch
@@ -0,0 +1,24 @@
+From 90cac05f8a5436a8dd3714ad29e2d81eb8b4d39b Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Tue, 2 Feb 2016 22:41:09 +0100
+Subject: Avoid DeprecationWarning from Numpy.
+
+Patch-Name: 02-numpy-deprecation-warning.diff
+---
+ pyfits/tests/test_division.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyfits/tests/test_division.py b/pyfits/tests/test_division.py
+index da4df72..aa93264 100644
+--- a/pyfits/tests/test_division.py
++++ b/pyfits/tests/test_division.py
+@@ -18,7 +18,8 @@ class TestDivisionFunctions(PyfitsTestCase):
+ a1 = np.rec.array(
+ s,
+ dtype=np.dtype([('c1', '>i4'), ('c2', '|S3'),
+- ('c3', '>f4'), ('c4', '|i1')]))
++ ('c3', '>f4'), ('c4', '|i1')]),
++ shape=len(s) // 12)
+
+ def test_card_with_continue(self):
+ h = fits.PrimaryHDU()
diff --git a/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch b/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch
new file mode 100644
index 00000000..d0fac84
--- /dev/null
+++ b/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch
@@ -0,0 +1,43 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Update image tests for cfitsio 3.380
+ Make TFORMx check more flexible. The maximal column length in cfitsio
+ changed between version 3370 and 3380. This patch checks their syntax,
+ without a specific length.
+ .
+ HCOMPRESSed images are allowed to deviate from the original by about
+ 1/quantize_level of the RMS in each tile. This patch changes the absolute
+ identity test
+Bug: https://github.com/astropy/astropy/issues/4646
+Bug: https://github.com/astropy/astropy/issues/4647
+Bug-Debian: https://bugs.debian.org/816595
+--- a/pyfits/tests/test_image.py
++++ b/pyfits/tests/test_image.py
+@@ -2,6 +2,7 @@
+
+ import math
+ import os
++import re
+ import time
+ import warnings
+
+@@ -1014,7 +1015,7 @@
+ hdu.writeto(self.temp('test.fits'))
+
+ with fits.open(self.temp('test.fits')) as hdul:
+- assert (hdul['SCI'].data == cube).all()
++ assert np.abs(hdul['SCI'].data - cube).max() < 1./15.
+
+ def test_subtractive_dither_seed(self):
+ """
+@@ -1269,8 +1270,8 @@
+
+ with fits.open(self.temp('test.fits'),
+ disable_image_compression=True) as h:
+- assert h[1].header['TFORM1'] == '1PB(30)'
+- assert h[1].header['TFORM2'] == '1PB(359)'
++ assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM1'])
++ assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM2'])
+
+ def test_compression_update_header(self):
+ """Regression test for
+
diff --git a/dev-python/pyfits/pyfits-3.4.ebuild b/dev-python/pyfits/pyfits-3.4-r1.ebuild
similarity index 87%
rename from dev-python/pyfits/pyfits-3.4.ebuild
rename to dev-python/pyfits/pyfits-3.4-r1.ebuild
index dd6036d..a62069c 100644
--- a/dev-python/pyfits/pyfits-3.4.ebuild
+++ b/dev-python/pyfits/pyfits-3.4-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5} )
@@ -32,12 +32,13 @@ DEPEND="${RDEPEND}
)
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}"/${PN}-3.2.1-unbundle-cfitsio.patch )
+PATCHES=( "${FILESDIR}"/01-system-cfitsio.patch
+ "${FILESDIR}"/02-numpy-deprecation-warning.patch
+ "${FILESDIR}"/03-fix-for-cfitsio-3380.patch )
python_prepare_all() {
- sed -i \
- -e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
- "${S}"/setup.cfg || die
+ sed -e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
+ -i "${S}"/setup.cfg || die
# https://github.com/spacetelescope/PyFITS/issues/95
sed -e "s/except UserWarning, w/except UserWarning as w/" \
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pyfits/files/, dev-python/pyfits/
@ 2019-12-28 16:47 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2019-12-28 16:47 UTC (permalink / raw
To: gentoo-commits
commit: 196398dd4a25a7da3b9e8cefc5ae533ab4c5b600
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 16:47:38 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 16:47:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196398dd
dev-python/pyfits: remove last-rited pkg
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-python/pyfits/Manifest | 2 -
dev-python/pyfits/files/01-system-cfitsio.patch | 176 ---------------------
.../files/02-numpy-deprecation-warning.patch | 24 ---
.../pyfits/files/03-fix-for-cfitsio-3380.patch | 43 -----
.../files/pyfits-3.2.1-unbundle-cfitsio.patch | 98 ------------
dev-python/pyfits/metadata.xml | 20 ---
dev-python/pyfits/pyfits-3.3-r1.ebuild | 72 ---------
dev-python/pyfits/pyfits-3.4-r1.ebuild | 72 ---------
8 files changed, 507 deletions(-)
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
deleted file mode 100644
index 6474e51bf84..00000000000
--- a/dev-python/pyfits/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pyfits-3.3.tar.gz 1646403 BLAKE2B 6d97198353c93e8d40545bba2677a9f3be5a810c68ddb8b6243debee82fc6ba256ed1a314a42a1c18eb4a2e037f191709bdf17fc08256256d797d7524c84a7f2 SHA512 561fe61050e61745054e0e4712c4413e129293b062d2020219b61d648d7093ce6952e1f26da955a1bf570f76ba7eddeb1805c99f679300b072ef6bacc2e4c90a
-DIST pyfits-3.4.tar.gz 1692414 BLAKE2B d3bcd3ce992c63e3a9e520c1bba56bd908590fddc0bfbb35941c7cdf8ff98c384bf5631fe86f8c6c8f292df9a38f299edde431d37a85dce0db1b869b92965bd7 SHA512 b569f871f26dcd9cb2fbe9d823d55c525e8101b0fcf83fff4bc3f3ec4bc7f680953a29634518ea19383f533f5e23b3703fffdb4e0d577b1023b4323254ef3a7e
diff --git a/dev-python/pyfits/files/01-system-cfitsio.patch b/dev-python/pyfits/files/01-system-cfitsio.patch
deleted file mode 100644
index f2ce935c7ea..00000000000
--- a/dev-python/pyfits/files/01-system-cfitsio.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 70fe4dac3f68c3eed369d42e6a49e7865db8b250 Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 10:31:01 -0700
-Subject: 01-system-cfitsio.diff
-
-Patch-Name: 01-system-cfitsio.diff
----
- setup.cfg | 145 +++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 73 insertions(+), 72 deletions(-)
-
-diff --git a/setup.cfg b/setup.cfg
-index 3a05c62..3a64f33 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -40,81 +40,81 @@ scripts =
-
- [extension=pyfits.compression]
- sources =
-- cextern/cfitsio/adler32.c
-- cextern/cfitsio/buffers.c
-- cextern/cfitsio/cfileio.c
-- cextern/cfitsio/checksum.c
-- cextern/cfitsio/crc32.c
-- cextern/cfitsio/deflate.c
-- cextern/cfitsio/drvrfile.c
-- cextern/cfitsio/drvrgsiftp.c
-- cextern/cfitsio/drvrmem.c
-- cextern/cfitsio/drvrnet.c
-- cextern/cfitsio/drvrsmem.c
-- cextern/cfitsio/editcol.c
-- cextern/cfitsio/edithdu.c
-- cextern/cfitsio/eval_f.c
-- cextern/cfitsio/eval_l.c
-- cextern/cfitsio/eval_y.c
-- cextern/cfitsio/fitscore.c
-- cextern/cfitsio/fits_hcompress.c
-- cextern/cfitsio/fits_hdecompress.c
-- cextern/cfitsio/getcolb.c
-- cextern/cfitsio/getcol.c
-- cextern/cfitsio/getcold.c
-- cextern/cfitsio/getcole.c
-- cextern/cfitsio/getcoli.c
-- cextern/cfitsio/getcolj.c
-- cextern/cfitsio/getcolk.c
-- cextern/cfitsio/getcoll.c
-- cextern/cfitsio/getcolsb.c
-- cextern/cfitsio/getcols.c
-- cextern/cfitsio/getcolui.c
-- cextern/cfitsio/getcoluj.c
-- cextern/cfitsio/getcoluk.c
-- cextern/cfitsio/getkey.c
-- cextern/cfitsio/group.c
-- cextern/cfitsio/grparser.c
-- cextern/cfitsio/histo.c
-- cextern/cfitsio/imcompress.c
-- cextern/cfitsio/infback.c
-- cextern/cfitsio/inffast.c
-- cextern/cfitsio/inflate.c
-- cextern/cfitsio/inftrees.c
-- cextern/cfitsio/iraffits.c
-- cextern/cfitsio/modkey.c
-- cextern/cfitsio/pliocomp.c
-- cextern/cfitsio/putcolb.c
-- cextern/cfitsio/putcol.c
-- cextern/cfitsio/putcold.c
-- cextern/cfitsio/putcole.c
-- cextern/cfitsio/putcoli.c
-- cextern/cfitsio/putcolj.c
-- cextern/cfitsio/putcolk.c
-- cextern/cfitsio/putcoll.c
-- cextern/cfitsio/putcolsb.c
-- cextern/cfitsio/putcols.c
-- cextern/cfitsio/putcolu.c
-- cextern/cfitsio/putcolui.c
-- cextern/cfitsio/putcoluj.c
-- cextern/cfitsio/putcoluk.c
-- cextern/cfitsio/putkey.c
-- cextern/cfitsio/quantize.c
-- cextern/cfitsio/region.c
-- cextern/cfitsio/ricecomp.c
-- cextern/cfitsio/scalnull.c
-- cextern/cfitsio/swapproc.c
-- cextern/cfitsio/trees.c
-- cextern/cfitsio/uncompr.c
-- cextern/cfitsio/wcssub.c
-- cextern/cfitsio/wcsutil.c
-- cextern/cfitsio/zcompress.c
-- cextern/cfitsio/zuncompress.c
-- cextern/cfitsio/zutil.c
-+# cextern/cfitsio/adler32.c
-+# cextern/cfitsio/buffers.c
-+# cextern/cfitsio/cfileio.c
-+# cextern/cfitsio/checksum.c
-+# cextern/cfitsio/crc32.c
-+# cextern/cfitsio/deflate.c
-+# cextern/cfitsio/drvrfile.c
-+# cextern/cfitsio/drvrgsiftp.c
-+# cextern/cfitsio/drvrmem.c
-+# cextern/cfitsio/drvrnet.c
-+# cextern/cfitsio/drvrsmem.c
-+# cextern/cfitsio/editcol.c
-+# cextern/cfitsio/edithdu.c
-+# cextern/cfitsio/eval_f.c
-+# cextern/cfitsio/eval_l.c
-+# cextern/cfitsio/eval_y.c
-+# cextern/cfitsio/fitscore.c
-+# cextern/cfitsio/fits_hcompress.c
-+# cextern/cfitsio/fits_hdecompress.c
-+# cextern/cfitsio/getcolb.c
-+# cextern/cfitsio/getcol.c
-+# cextern/cfitsio/getcold.c
-+# cextern/cfitsio/getcole.c
-+# cextern/cfitsio/getcoli.c
-+# cextern/cfitsio/getcolj.c
-+# cextern/cfitsio/getcolk.c
-+# cextern/cfitsio/getcoll.c
-+# cextern/cfitsio/getcolsb.c
-+# cextern/cfitsio/getcols.c
-+# cextern/cfitsio/getcolui.c
-+# cextern/cfitsio/getcoluj.c
-+# cextern/cfitsio/getcoluk.c
-+# cextern/cfitsio/getkey.c
-+# cextern/cfitsio/group.c
-+# cextern/cfitsio/grparser.c
-+# cextern/cfitsio/histo.c
-+# cextern/cfitsio/imcompress.c
-+# cextern/cfitsio/infback.c
-+# cextern/cfitsio/inffast.c
-+# cextern/cfitsio/inflate.c
-+# cextern/cfitsio/inftrees.c
-+# cextern/cfitsio/iraffits.c
-+# cextern/cfitsio/modkey.c
-+# cextern/cfitsio/pliocomp.c
-+# cextern/cfitsio/putcolb.c
-+# cextern/cfitsio/putcol.c
-+# cextern/cfitsio/putcold.c
-+# cextern/cfitsio/putcole.c
-+# cextern/cfitsio/putcoli.c
-+# cextern/cfitsio/putcolj.c
-+# cextern/cfitsio/putcolk.c
-+# cextern/cfitsio/putcoll.c
-+# cextern/cfitsio/putcolsb.c
-+# cextern/cfitsio/putcols.c
-+# cextern/cfitsio/putcolu.c
-+# cextern/cfitsio/putcolui.c
-+# cextern/cfitsio/putcoluj.c
-+# cextern/cfitsio/putcoluk.c
-+# cextern/cfitsio/putkey.c
-+# cextern/cfitsio/quantize.c
-+# cextern/cfitsio/region.c
-+# cextern/cfitsio/ricecomp.c
-+# cextern/cfitsio/scalnull.c
-+# cextern/cfitsio/swapproc.c
-+# cextern/cfitsio/trees.c
-+# cextern/cfitsio/uncompr.c
-+# cextern/cfitsio/wcssub.c
-+# cextern/cfitsio/wcsutil.c
-+# cextern/cfitsio/zcompress.c
-+# cextern/cfitsio/zuncompress.c
-+# cextern/cfitsio/zutil.c
- src/compressionmodule.c
- include_dirs =
- numpy
-- cextern/cfitsio
-+# cextern/cfitsio
- extra_compile_args =
- -Wno-declaration-after-statement
- -Wno-unused-variable
-@@ -125,6 +125,7 @@ extra_compile_args =
- -Wno-unused
- -Wno-comments
- -Wno-switch
-+libraries = cfitsio
- optional = True
- fail_message =
- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/dev-python/pyfits/files/02-numpy-deprecation-warning.patch b/dev-python/pyfits/files/02-numpy-deprecation-warning.patch
deleted file mode 100644
index 026e6b829d4..00000000000
--- a/dev-python/pyfits/files/02-numpy-deprecation-warning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 90cac05f8a5436a8dd3714ad29e2d81eb8b4d39b Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Tue, 2 Feb 2016 22:41:09 +0100
-Subject: Avoid DeprecationWarning from Numpy.
-
-Patch-Name: 02-numpy-deprecation-warning.diff
----
- pyfits/tests/test_division.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pyfits/tests/test_division.py b/pyfits/tests/test_division.py
-index da4df72..aa93264 100644
---- a/pyfits/tests/test_division.py
-+++ b/pyfits/tests/test_division.py
-@@ -18,7 +18,8 @@ class TestDivisionFunctions(PyfitsTestCase):
- a1 = np.rec.array(
- s,
- dtype=np.dtype([('c1', '>i4'), ('c2', '|S3'),
-- ('c3', '>f4'), ('c4', '|i1')]))
-+ ('c3', '>f4'), ('c4', '|i1')]),
-+ shape=len(s) // 12)
-
- def test_card_with_continue(self):
- h = fits.PrimaryHDU()
diff --git a/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch b/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch
deleted file mode 100644
index d0fac84d1e2..00000000000
--- a/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Update image tests for cfitsio 3.380
- Make TFORMx check more flexible. The maximal column length in cfitsio
- changed between version 3370 and 3380. This patch checks their syntax,
- without a specific length.
- .
- HCOMPRESSed images are allowed to deviate from the original by about
- 1/quantize_level of the RMS in each tile. This patch changes the absolute
- identity test
-Bug: https://github.com/astropy/astropy/issues/4646
-Bug: https://github.com/astropy/astropy/issues/4647
-Bug-Debian: https://bugs.debian.org/816595
---- a/pyfits/tests/test_image.py
-+++ b/pyfits/tests/test_image.py
-@@ -2,6 +2,7 @@
-
- import math
- import os
-+import re
- import time
- import warnings
-
-@@ -1014,7 +1015,7 @@
- hdu.writeto(self.temp('test.fits'))
-
- with fits.open(self.temp('test.fits')) as hdul:
-- assert (hdul['SCI'].data == cube).all()
-+ assert np.abs(hdul['SCI'].data - cube).max() < 1./15.
-
- def test_subtractive_dither_seed(self):
- """
-@@ -1269,8 +1270,8 @@
-
- with fits.open(self.temp('test.fits'),
- disable_image_compression=True) as h:
-- assert h[1].header['TFORM1'] == '1PB(30)'
-- assert h[1].header['TFORM2'] == '1PB(359)'
-+ assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM1'])
-+ assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM2'])
-
- def test_compression_update_header(self):
- """Regression test for
-
diff --git a/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch b/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch
deleted file mode 100644
index a5d7e621748..00000000000
--- a/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- setup.cfg.orig 2014-03-10 10:50:38.200531959 -0700
-+++ setup.cfg 2014-03-10 10:52:19.288232002 -0700
-@@ -36,92 +36,12 @@
-
- [extension=pyfits.compression]
- sources =
-- cextern/cfitsio/adler32.c
-- cextern/cfitsio/buffers.c
-- cextern/cfitsio/cfileio.c
-- cextern/cfitsio/checksum.c
-- cextern/cfitsio/crc32.c
-- cextern/cfitsio/deflate.c
-- cextern/cfitsio/drvrfile.c
-- cextern/cfitsio/drvrgsiftp.c
-- cextern/cfitsio/drvrmem.c
-- cextern/cfitsio/drvrnet.c
-- cextern/cfitsio/drvrsmem.c
-- cextern/cfitsio/editcol.c
-- cextern/cfitsio/edithdu.c
-- cextern/cfitsio/eval_f.c
-- cextern/cfitsio/eval_l.c
-- cextern/cfitsio/eval_y.c
-- cextern/cfitsio/fitscore.c
-- cextern/cfitsio/fits_hcompress.c
-- cextern/cfitsio/fits_hdecompress.c
-- cextern/cfitsio/getcolb.c
-- cextern/cfitsio/getcol.c
-- cextern/cfitsio/getcold.c
-- cextern/cfitsio/getcole.c
-- cextern/cfitsio/getcoli.c
-- cextern/cfitsio/getcolj.c
-- cextern/cfitsio/getcolk.c
-- cextern/cfitsio/getcoll.c
-- cextern/cfitsio/getcolsb.c
-- cextern/cfitsio/getcols.c
-- cextern/cfitsio/getcolui.c
-- cextern/cfitsio/getcoluj.c
-- cextern/cfitsio/getcoluk.c
-- cextern/cfitsio/getkey.c
-- cextern/cfitsio/group.c
-- cextern/cfitsio/grparser.c
-- cextern/cfitsio/histo.c
-- cextern/cfitsio/imcompress.c
-- cextern/cfitsio/infback.c
-- cextern/cfitsio/inffast.c
-- cextern/cfitsio/inflate.c
-- cextern/cfitsio/inftrees.c
-- cextern/cfitsio/iraffits.c
-- cextern/cfitsio/modkey.c
-- cextern/cfitsio/pliocomp.c
-- cextern/cfitsio/putcolb.c
-- cextern/cfitsio/putcol.c
-- cextern/cfitsio/putcold.c
-- cextern/cfitsio/putcole.c
-- cextern/cfitsio/putcoli.c
-- cextern/cfitsio/putcolj.c
-- cextern/cfitsio/putcolk.c
-- cextern/cfitsio/putcoll.c
-- cextern/cfitsio/putcolsb.c
-- cextern/cfitsio/putcols.c
-- cextern/cfitsio/putcolu.c
-- cextern/cfitsio/putcolui.c
-- cextern/cfitsio/putcoluj.c
-- cextern/cfitsio/putcoluk.c
-- cextern/cfitsio/putkey.c
-- cextern/cfitsio/quantize.c
-- cextern/cfitsio/region.c
-- cextern/cfitsio/ricecomp.c
-- cextern/cfitsio/scalnull.c
-- cextern/cfitsio/swapproc.c
-- cextern/cfitsio/trees.c
-- cextern/cfitsio/uncompr.c
-- cextern/cfitsio/wcssub.c
-- cextern/cfitsio/wcsutil.c
-- cextern/cfitsio/zcompress.c
-- cextern/cfitsio/zuncompress.c
-- cextern/cfitsio/zutil.c
- src/compressionmodule.c
- include_dirs =
- numpy
-- cextern/cfitsio
--extra_compile_args =
-- -Wno-declaration-after-statement
-- -Wno-unused-variable
-- -Wno-parentheses
-- -Wno-uninitialized
-- -Wno-format
-- -Wno-strict-prototypes
-- -Wno-unused
-- -Wno-comments
-- -Wno-switch
--optional = True
-+libraries =
-+ cfitsio
-+optional = False
- fail_message =
- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- Failed to build PyFITS tile compression support. PyFITS will still
diff --git a/dev-python/pyfits/metadata.xml b/dev-python/pyfits/metadata.xml
deleted file mode 100644
index 4e1c8e2ff44..00000000000
--- a/dev-python/pyfits/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci-astronomy@gentoo.org</email>
- <name>Gentoo Astronomy Project</name>
- </maintainer>
- <maintainer type="project">
- <email>python@gentoo.org</email>
- <name>Python</name>
- </maintainer>
- <longdescription lang="en">
- PyFITS provides an interface to FITS formatted files under the
- Python scripting language and PyRAF, the Python-based interface to
- IRAF.
-</longdescription>
- <upstream>
- <remote-id type="pypi">pyfits</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyfits/pyfits-3.3-r1.ebuild b/dev-python/pyfits/pyfits-3.3-r1.ebuild
deleted file mode 100644
index 8f829e8cdbf..00000000000
--- a/dev-python/pyfits/pyfits-3.3-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- sci-libs/cfitsio:0="
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
- >=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
- doc? (
- dev-python/matplotlib[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
- dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
- dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
- )
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.1-unbundle-cfitsio.patch )
-
-python_prepare_all() {
- sed -i \
- -e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
- "${S}"/setup.cfg || die
-
- # https://github.com/spacetelescope/PyFITS/issues/95
- sed \
- -e "s/except UserWarning, w/except UserWarning as w/" \
- -i lib/pyfits/scripts/fitscheck.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- cd "${BUILD_DIR}"/lib* || die
- nosetests --verbose || die
-}
-
-python_install() {
- distutils-r1_python_install
- local binary
- for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
- einfo "Renaming ${binary} to ${binary}-${PN}"
- mv ${binary}{,-${PN}} || die "failed renaming"
- done
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/. )
- DOCS=( FAQ.txt CHANGES.txt )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pyfits/pyfits-3.4-r1.ebuild b/dev-python/pyfits/pyfits-3.4-r1.ebuild
deleted file mode 100644
index 0945dacb774..00000000000
--- a/dev-python/pyfits/pyfits-3.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Provides an interface to FITS formatted files under python"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- sci-libs/cfitsio:0="
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
- >=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
- doc? (
- dev-python/matplotlib[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
- dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
- dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
- )
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/01-system-cfitsio.patch
- "${FILESDIR}"/02-numpy-deprecation-warning.patch
- "${FILESDIR}"/03-fix-for-cfitsio-3380.patch )
-
-python_prepare_all() {
- sed -e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
- -i "${S}"/setup.cfg || die
-
- # https://github.com/spacetelescope/PyFITS/issues/95
- sed -e "s/except UserWarning, w/except UserWarning as w/" \
- -i pyfits/scripts/fitscheck.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- cd "${BUILD_DIR}"/lib* || die
- nosetests --verbose || die
-}
-
-python_install() {
- distutils-r1_python_install
- local binary
- for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
- einfo "Renaming ${binary} to ${binary}-${PN}"
- mv ${binary}{,-${PN}} || die "failed renaming"
- done
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/. )
- DOCS=( FAQ.txt CHANGES.txt )
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-28 16:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-17 20:15 [gentoo-commits] repo/gentoo:master commit in: dev-python/pyfits/files/, dev-python/pyfits/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2019-12-28 16:47 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox