From: Ole Streicher Date: Wed, 24 Feb 2021 09:09:50 +0000 (+0100) Subject: python-fitsio (1.1.4+dfsg-1) unstable; urgency=medium X-Git-Tag: archive/raspbian/1.2.5+dfsg-1+rpi1~1^2^2^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aa59cb7dd012f3f7c399babaa52be9755f9854cd;p=python-fitsio.git python-fitsio (1.1.4+dfsg-1) unstable; urgency=medium * New upstream version 1.1.4+dfsg * Rediff patches * Push Standards-Version to 4.5.1. No changes needed * Add "Rules-Requires-Root: no" to d/control * Push dh-compat to 13 [dgit import unpatched python-fitsio 1.1.4+dfsg-1] --- aa59cb7dd012f3f7c399babaa52be9755f9854cd diff --cc debian/README.Debian index 0000000,0000000..8ce7127 new file mode 100644 --- /dev/null +++ b/debian/README.Debian @@@ -1,0 -1,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 --cc debian/changelog index 0000000,0000000..d4280d1 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,150 @@@ ++python-fitsio (1.1.4+dfsg-1) unstable; urgency=medium ++ ++ * New upstream version 1.1.4+dfsg ++ * Rediff patches ++ * Push Standards-Version to 4.5.1. No changes needed ++ * Add "Rules-Requires-Root: no" to d/control ++ * Push dh-compat to 13 ++ ++ -- Ole Streicher Wed, 24 Feb 2021 10:09:50 +0100 ++ ++python-fitsio (1.1.3+dfsg-2) unstable; urgency=medium ++ ++ * Switch back to unstable ++ ++ -- Ole Streicher Mon, 02 Nov 2020 08:25:06 +0100 ++ ++python-fitsio (1.1.3+dfsg-1) experimental; urgency=medium ++ ++ * New upstream version 1.1.3+dfsg. Rediff patches ++ * Try to run build time tests on arm platform. Switch to experimental ++ ++ -- Ole Streicher Wed, 14 Oct 2020 08:58:47 +0200 ++ ++python-fitsio (1.1.2+dfsg-1) unstable; urgency=low ++ ++ * New upstream version 1.1.2+dfsg. Rediff patches. Closes: #956521 ++ ++ -- Ole Streicher Tue, 28 Apr 2020 08:43:19 +0200 ++ ++python-fitsio (1.1.1+dfsg-1) unstable; urgency=low ++ ++ * New upstream version 1.1.1+dfsg. Rediff patches ++ ++ -- Ole Streicher Wed, 11 Mar 2020 08:33:41 +0100 ++ ++python-fitsio (1.1.0+dfsg-1) unstable; urgency=low ++ ++ * New upstream version 1.1.0+dfsg. Rediff patches ++ * Push Standards-Version to 4.5.0. No changes required ++ ++ -- Ole Streicher Fri, 21 Feb 2020 17:47:44 +0100 ++ ++python-fitsio (1.0.5+dfsg-2) unstable; urgency=low ++ ++ * Add tests on salsa ++ * Remove test for Python-2 package ++ * Remove d/compat ++ ++ -- Ole Streicher Mon, 05 Aug 2019 11:47:37 +0200 ++ ++python-fitsio (1.0.5+dfsg-1) unstable; urgency=low ++ ++ * New upstream version 1.0.5+dfsg. Rediff patches ++ * Push Standards-Version to 4.4.0. No changes needed ++ * Remove Python 2 package ++ ++ -- Ole Streicher Thu, 18 Jul 2019 14:08:15 +0200 ++ ++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 --cc debian/control index 0000000,0000000..ce4e41e new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,30 @@@ ++Source: python-fitsio ++Section: python ++Priority: optional ++Maintainer: Debian Astronomy Team ++Uploaders: Ole Streicher ++Build-Depends: debhelper-compat (= 13), ++ dh-python, ++ libcfitsio-dev, ++ python3-all-dev, ++ python3-numpy, ++ python3-setuptools ++Standards-Version: 4.5.1 ++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 ++Rules-Requires-Root: no ++ ++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). diff --cc debian/copyright index 0000000,0000000..ad5ee29 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,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 --cc debian/gitlab-ci.yml index 0000000,0000000..6b506f8 new file mode 100644 --- /dev/null +++ b/debian/gitlab-ci.yml @@@ -1,0 -1,0 +1,8 @@@ ++ ++include: ++ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml ++ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml ++ ++variables: ++ RELEASE: 'unstable' ++ diff --cc debian/patches/Force-the-use-of-the-system-cfitsio.patch index 0000000,0000000..8199ae1 new file mode 100644 --- /dev/null +++ b/debian/patches/Force-the-use-of-the-system-cfitsio.patch @@@ -1,0 -1,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 afdd162..f0327be 100644 ++--- a/setup.py +++++ b/setup.py ++@@ -31,7 +31,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 --cc debian/patches/Mark-failures-that-are-known-to-fail-with-the-original-cf.patch index 0000000,0000000..0f6ae12 new file mode 100644 --- /dev/null +++ b/debian/patches/Mark-failures-that-are-known-to-fail-with-the-original-cf.patch @@@ -1,0 -1,0 +1,29 @@@ ++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 | 3 ++- ++ 1 file changed, 2 insertions(+), 1 deletion(-) ++ ++diff --git a/fitsio/test.py b/fitsio/test.py ++index 49d5e4c..35d5de6 100644 ++--- a/fitsio/test.py +++++ b/fitsio/test.py ++@@ -1161,7 +1161,7 @@ DATASUM = / checksum of the data records\n""" ++ fname=tempfile.mktemp(prefix='fitsio-ImageWrite-',suffix='.fits.fz') ++ try: ++ with fitsio.FITS(fname,'rw',clobber=True) as fits: ++- dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8'] +++ dtypes = ['u1','i1', 'i2','u4','i4','f4','f8'] ++ ++ for dtype in dtypes: ++ ++@@ -2397,6 +2397,7 @@ DATASUM = / checksum of the data records\n""" ++ 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 --cc debian/patches/series index 0000000,0000000..85c2594 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,2 @@@ ++Force-the-use-of-the-system-cfitsio.patch ++Mark-failures-that-are-known-to-fail-with-the-original-cf.patch diff --cc debian/rules index 0000000,0000000..eec1d1a new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,13 @@@ ++#!/usr/bin/make -f ++#export DH_VERBOSE=1 ++ ++PYTHON3:=$(shell py3versions -vr) ++export PYBUILD_NAME=fitsio ++export http_proxy=127.0.0.1:9 ++ ++%: ++ dh $@ --with python3 --buildsystem=pybuild ++ ++override_dh_shlibdeps: ++ dh_shlibdeps ++ dh_numpy3 diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/tests/control index 0000000,0000000..193b6a0 new file mode 100644 --- /dev/null +++ b/debian/tests/control @@@ -1,0 -1,0 +1,3 @@@ ++Test-Command: cd $ADTTMP && python3 -c "import fitsio; exit(fitsio.test.test())" ++Depends: python3-fitsio ++Restrictions: allow-stderr diff --cc debian/upstream/metadata index 0000000,0000000..0fc6e5d new file mode 100644 --- /dev/null +++ b/debian/upstream/metadata @@@ -1,0 -1,0 +1,3 @@@ ++Bug-Database: https://github.com/esheldon/fitsio/issues ++Name: fitsio ++Repository: https://github.com/esheldon/fitsio diff --cc debian/watch index 0000000,0000000..ee6449d new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,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)))