From 0b60a49ebf4db69991be4801ae8dbb65e0cc4f2b Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 18 Jan 2019 09:59:47 +0100 Subject: [PATCH] Import python-fitsio_0.9.12+dfsg-1.debian.tar.xz [dgit import tarball python-fitsio 0.9.12+dfsg-1 python-fitsio_0.9.12+dfsg-1.debian.tar.xz] --- README.Debian | 6 ++ changelog | 92 +++++++++++++++++++ compat | 1 + control | 50 ++++++++++ copyright | 44 +++++++++ .../Force-the-use-of-the-system-cfitsio.patch | 22 +++++ ...e-known-to-fail-with-the-original-cf.patch | 38 ++++++++ patches/series | 2 + rules | 20 ++++ source/format | 1 + tests/control | 7 ++ upstream/metadata | 3 + watch | 3 + 13 files changed, 289 insertions(+) create mode 100644 README.Debian create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 patches/Force-the-use-of-the-system-cfitsio.patch create mode 100644 patches/Mark-failures-that-are-known-to-fail-with-the-original-cf.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 tests/control create mode 100644 upstream/metadata create mode 100644 watch diff --git a/README.Debian b/README.Debian new file mode 100644 index 0000000..8ce7127 --- /dev/null +++ b/README.Debian @@ -0,0 +1,6 @@ +Contrary to the original package, the Debian package uses the +(unpatched) cfitsio library that comes with Debian. This causes the +bzip2 compression switched off, and the compressed read with the "u2" +datatype does not work. + +-- Ole Streicher Wed, 13 Apr 2016 17:24:30 +0200 diff --git a/changelog b/changelog new file mode 100644 index 0000000..a3b4b13 --- /dev/null +++ b/changelog @@ -0,0 +1,92 @@ +python-fitsio (0.9.12+dfsg-1) unstable; urgency=low + + * New upstream version 0.9.12+dfsg. Rediff patches + * Push Standards-Version to 4.3.0. No changes required. + * New build dependencies setuptools + * Push compat to 12 + + -- Ole Streicher Fri, 18 Jan 2019 09:59:47 +0100 + +python-fitsio (0.9.11+dfsg-4) unstable; urgency=medium + + [ Ole Streicher ] + * Drop alignment patches. They didn't work. + + [ Matthias Klose ] + * Dont run autotests on armhf for now (partially resolves #902990) + + -- Ole Streicher Sun, 15 Jul 2018 16:36:56 +0200 + +python-fitsio (0.9.11+dfsg-3) unstable; urgency=medium + + * Disable failing checksum test + + -- Ole Streicher Fri, 13 Jul 2018 08:47:51 +0200 + +python-fitsio (0.9.11+dfsg-2) unstable; urgency=medium + + * Update VCS fields to use salsa.d.o + * Push compat to 11 + * Push Standards-Version to 4.1.5. Change copyright format URL to https + + -- Ole Streicher Thu, 05 Jul 2018 11:09:18 +0200 + +python-fitsio (0.9.11+dfsg-1) unstable; urgency=low + + * Propagate CI test exit code + * New upstream version 0.9.11+dfsg + * Rediff patches + * Push Standards-Version to 4.0.0. No changes + + -- Ole Streicher Fri, 23 Jun 2017 17:44:06 +0200 + +python-fitsio (0.9.10+dfsg-1) unstable; urgency=medium + + * Imported Upstream version 0.9.10+dfsg + + -- Ole Streicher Thu, 18 Aug 2016 14:38:31 +0200 + +python-fitsio (0.9.9.1+dfsg-1) unstable; urgency=low + + * Imported Upstream version 0.9.9.1+dfsg + + -- Ole Streicher Wed, 20 Jul 2016 17:52:17 +0200 + +python-fitsio (0.9.9+dfsg-1) unstable; urgency=low + + * Imported Upstream version 0.9.9+dfsg + + -- Ole Streicher Fri, 15 Jul 2016 08:54:33 +0200 + +python-fitsio (0.9.8+dfsg-5) unstable; urgency=low + + * Skip bzip2 unittest instead of xfail to avoid bus error on sparc64 + + -- Ole Streicher Thu, 21 Apr 2016 21:47:58 +0200 + +python-fitsio (0.9.8+dfsg-4) unstable; urgency=low + + * Align test data in testAsciiTableWriteRead. Closes: #821132 + + -- Ole Streicher Thu, 21 Apr 2016 14:48:49 +0200 + +python-fitsio (0.9.8+dfsg-3) unstable; urgency=low + + * Push Standards-Version to 3.9.8 (no changes) + * Fix FTBFS on mips and powerpc + + -- Ole Streicher Wed, 20 Apr 2016 11:22:39 +0200 + +python-fitsio (0.9.8+dfsg-2) unstable; urgency=low + + * Fix CI test call + * Fix crash on 32-bit platforms Closes: #821131 + * Fix Vcs-Git URL + + -- Ole Streicher Sat, 16 Apr 2016 22:01:34 +0200 + +python-fitsio (0.9.8+dfsg-1) unstable; urgency=low + + * Initial release. (Closes: #820811) + + -- Ole Streicher Thu, 14 Apr 2016 22:56:03 +0200 diff --git a/compat b/compat new file mode 100644 index 0000000..48082f7 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +12 diff --git a/control b/control new file mode 100644 index 0000000..c9fd408 --- /dev/null +++ b/control @@ -0,0 +1,50 @@ +Source: python-fitsio +Section: python +Priority: optional +Maintainer: Debian Astronomy Team +Uploaders: Ole Streicher +Build-Depends: debhelper (>= 12), + dh-python, + libcfitsio-dev, + python-all-dev (>= 2.7), + python-numpy, + python-setuptools, + python3-all-dev, + python3-numpy, + python3-setuptools +Standards-Version: 4.3.0 +Homepage: https://github.com/esheldon/fitsio +Vcs-Git: https://salsa.debian.org/debian-astro-team/python-fitsio.git +Vcs-Browser: https://salsa.debian.org/debian-astro-team/python-fitsio + +Package: python-fitsio +Architecture: any +Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} +Description: Python 2 library to read from and write to FITS files + Fitsio provides an easy to use object-oriented API including + providing a Numpy interface to FITS files read from CFITSIO. It + allows direct access to the columns of a FITS binary table which can + be useful for reading large fits files. Compared to astropy.io.fits, + this package is closer to the underlying cfitsio library. + . + Fitsio also exposes a microlanguage (implemented in CFITSIO) for + making efficient SQL-like queries of tables (single tables only + though–no joins or anything like that). + . + This is the Python 2 package. + +Package: python3-fitsio +Architecture: any +Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} +Description: Python 3 library to read from and write to FITS files + Fitsio provides an easy to use object-oriented API including + providing a Numpy interface to FITS files read from CFITSIO. It + allows direct access to the columns of a FITS binary table which can + be useful for reading large fits files. Compared to astropy.io.fits, + this package is closer to the underlying cfitsio library. + . + Fitsio also exposes a microlanguage (implemented in CFITSIO) for + making efficient SQL-like queries of tables (single tables only + though–no joins or anything like that). + . + This is the Python 3 package. diff --git a/copyright b/copyright new file mode 100644 index 0000000..ad5ee29 --- /dev/null +++ b/copyright @@ -0,0 +1,44 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: fitsio +Files-Excluded: cfitsio* + +Files: * +Copyright: 2011 Erin Sheldon, BNL. erin dot sheldon at gmail dot com +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. + +Files: debian/* +Copyright: 2016 Ole Streicher +License: BSD-2-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. diff --git a/patches/Force-the-use-of-the-system-cfitsio.patch b/patches/Force-the-use-of-the-system-cfitsio.patch new file mode 100644 index 0000000..ff53692 --- /dev/null +++ b/patches/Force-the-use-of-the-system-cfitsio.patch @@ -0,0 +1,22 @@ +From: Ole Streicher +Date: Fri, 15 Jul 2016 08:46:15 +0200 +Subject: Force the use of the system cfitsio + +The command line option does not help here since it works only with build_ext. +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index a55ed13..336d838 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,7 +30,7 @@ class build_ext_subclass(build_ext): + cfitsio_dir = 'cfitsio%s' % cfitsio_version + + def initialize_options(self): +- self.use_system_fitsio = False ++ self.use_system_fitsio = True + self.system_fitsio_includedir = None + self.system_fitsio_libdir = None + build_ext.initialize_options(self) diff --git a/patches/Mark-failures-that-are-known-to-fail-with-the-original-cf.patch b/patches/Mark-failures-that-are-known-to-fail-with-the-original-cf.patch new file mode 100644 index 0000000..b93b9b6 --- /dev/null +++ b/patches/Mark-failures-that-are-known-to-fail-with-the-original-cf.patch @@ -0,0 +1,38 @@ +From: Ole Streicher +Date: Fri, 15 Jul 2016 08:46:15 +0200 +Subject: Mark failures that are known to fail with the original cfitsio + +--- + fitsio/test.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/fitsio/test.py b/fitsio/test.py +index 32b284e..e8feecd 100644 +--- a/fitsio/test.py ++++ b/fitsio/test.py +@@ -643,7 +643,7 @@ class TestReadWrite(unittest.TestCase): + try: + with fitsio.FITS(fname,'rw',clobber=True) as fits: + # note i8 not supported for compressed! +- dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8'] ++ dtypes = ['u1','i1', 'i2','u4','i4','f4','f8'] + + for dtype in dtypes: + data = numpy.arange(5*20,dtype=dtype).reshape(5,20) +@@ -667,7 +667,7 @@ class TestReadWrite(unittest.TestCase): + try: + with fitsio.FITS(fname,'rw',clobber=True) as fits: + # note i8 not supported for compressed! +- dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8'] ++ dtypes = ['u1','i1', 'i2','u4','i4','f4','f8'] + + for dtype in dtypes: + data = numpy.arange(5*20,dtype=dtype).reshape(5,20) +@@ -1683,6 +1683,7 @@ class TestReadWrite(unittest.TestCase): + if os.path.exists(fname): + os.remove(fname) + ++ @unittest.skip("bzip2 is not supported with debian cfitsio package") + def testBz2Read(self): + ''' + Write a normal .fits file, run bzip2 on it, then read the bz2 diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..85c2594 --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +Force-the-use-of-the-system-cfitsio.patch +Mark-failures-that-are-known-to-fail-with-the-original-cf.patch diff --git a/rules b/rules new file mode 100755 index 0000000..bb36e0b --- /dev/null +++ b/rules @@ -0,0 +1,20 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +PYTHON2:=$(shell pyversions -vr) +PYTHON3:=$(shell py3versions -vr) +export PYBUILD_NAME=fitsio +export http_proxy=127.0.0.1:9 +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +%: + dh $@ --with python2,python3 --buildsystem=pybuild + +override_dh_shlibdeps: + dh_shlibdeps + dh_numpy + dh_numpy3 + +ifneq (,$(filter $(DEB_HOST_ARCH), armhf)) +override_dh_auto_test: +endif diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/tests/control b/tests/control new file mode 100644 index 0000000..902c324 --- /dev/null +++ b/tests/control @@ -0,0 +1,7 @@ +Test-Command: cd $ADTTMP && python -c "import fitsio; exit(fitsio.test.test())" +Depends: python-fitsio +Restrictions: allow-stderr + +Test-Command: cd $ADTTMP && python3 -c "import fitsio; exit(fitsio.test.test())" +Depends: python3-fitsio +Restrictions: allow-stderr diff --git a/upstream/metadata b/upstream/metadata new file mode 100644 index 0000000..0fc6e5d --- /dev/null +++ b/upstream/metadata @@ -0,0 +1,3 @@ +Bug-Database: https://github.com/esheldon/fitsio/issues +Name: fitsio +Repository: https://github.com/esheldon/fitsio diff --git a/watch b/watch new file mode 100644 index 0000000..ee6449d --- /dev/null +++ b/watch @@ -0,0 +1,3 @@ +version=3 +opts=dversionmangle=s/\+dfsg//,uversionmangle=s/(rc|a|b|c)/~$1/,repacksuffix=+dfsg \ +https://pypi.debian.net/fitsio/fitsio-([0-9].+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- 2.30.2