[Python-modules-commits] [pyfits] 04/10: merge patched into master
Aurelien Jarno
aurel32 at moszumanska.debian.org
Tue Feb 2 22:04:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch master
in repository pyfits.
commit 5e5f85e4dffbb400d204329aa9784639fe024de8
Merge: 15a802c 70fe4da
Author: Aurelien Jarno <aurelien at aurel32.net>
Date: Tue Feb 2 22:28:02 2016 +0100
merge patched into master
CHANGES.txt | 292 ++++++-
FAQ.txt | 79 +-
LICENSE.txt | 2 +-
MANIFEST.in | 6 +-
PKG-INFO | 294 ++++++-
debian/.git-dpm | 6 +-
debian/patches/01-system-cfitsio.diff | 8 +-
debian/patches/02-fitscheck-exception.diff | 23 -
debian/patches/03-testsuite-ignore-deprecated.diff | 60 --
debian/patches/04-replace-inspect-by-funcsigs.diff | 92 ---
debian/patches/05-checksum-32-bit.diff | 48 --
debian/patches/series | 4 -
.../{api_docs/api_headers.rst => api/cards.rst} | 12 +-
.../source/{api_docs/api_diff.rst => api/diff.rst} | 0
.../{api_docs/api_files.rst => api/files.rst} | 0
.../api_hdulists.rst => api/hdulists.rst} | 0
.../source/{api_docs/api_hdus.rst => api/hdus.rst} | 0
.../{api_docs/api_headers.rst => api/headers.rst} | 0
.../{api_docs/api_images.rst => api/images.rst} | 0
.../{api_docs/api_tables.rst => api/tables.rst} | 0
.../api_verification.rst => api/verification.rst} | 4 +-
docs/source/api_docs/api_cards.rst | 36 +-
docs/source/api_docs/api_diff.rst | 52 +-
docs/source/api_docs/api_files.rst | 49 +-
docs/source/api_docs/api_hdulists.rst | 19 +-
docs/source/api_docs/api_hdus.rst | 48 +-
docs/source/api_docs/api_headers.rst | 18 +-
docs/source/api_docs/api_images.rst | 35 +-
docs/source/api_docs/api_tables.rst | 68 +-
docs/source/api_docs/api_verification.rst | 77 +-
docs/source/appendix/header_transition.rst | 30 +-
docs/source/conf.py | 6 +-
docs/source/developers_guide/developers_guide.rst | 10 +-
docs/source/index.rst | 825 ++++++++++++++++++-
.../users_reference.rst => usage/examples.rst} | 0
.../users_headers.rst => usage/headers.rst} | 6 +-
.../users_image.rst => usage/image.rst} | 0
.../{users_guide/users_misc.rst => usage/misc.rst} | 0
.../users_scripts.rst => usage/scripts.rst} | 10 +
.../users_table.rst => usage/table.rst} | 6 +-
.../users_unfamiliar.rst => usage/unfamiliar.rst} | 42 +-
.../verification.rst} | 8 +-
docs/source/users_guide/users_headers.rst | 434 +---------
docs/source/users_guide/users_image.rst | 212 +----
docs/source/users_guide/users_intro.rst | 66 +-
docs/source/users_guide/users_misc.rst | 81 +-
docs/source/users_guide/users_reference.rst | 80 +-
docs/source/users_guide/users_scripts.rst | 28 +-
docs/source/users_guide/users_table.rst | 351 +--------
docs/source/users_guide/users_tutorial.rst | 668 +---------------
docs/source/users_guide/users_unfamiliar.rst | 536 +------------
docs/source/users_guide/users_verification.rst | 351 +--------
ez_setup.py | 415 ++++++++++
lib/pyfits.egg-info/requires.txt | 1 -
lib/pyfits/tests/util.py | 159 ----
{lib/pyfits.egg-info => pyfits.egg-info}/PKG-INFO | 294 ++++++-
.../SOURCES.txt | 157 ++--
.../dependency_links.txt | 0
.../entry_points.txt | 3 +-
.../not-zip-safe | 0
pyfits.egg-info/requires.txt | 1 +
.../top_level.txt | 0
{lib/pyfits => pyfits}/__init__.py | 8 +-
pyfits/_compat/__init__.py | 40 +
pyfits/_compat/_odict_py2/__init__.py | 190 +++++
pyfits/_compat/_weakset_py2/__init__.py | 219 ++++++
pyfits/_compat/odict.py | 7 +
pyfits/_compat/weakref.py | 6 +
pyfits/_numpy_hacks.py | 73 ++
{lib/pyfits => pyfits}/_release.py | 3 +-
{lib/pyfits => pyfits}/card.py | 340 +-------
{lib/pyfits => pyfits}/column.py | 526 ++++++++++---
{lib/pyfits => pyfits}/convenience.py | 35 +-
{lib/pyfits => pyfits}/core.py | 40 +-
{lib/pyfits => pyfits}/diff.py | 98 ++-
{lib/pyfits => pyfits}/extern/__init__.py | 0
{lib/pyfits => pyfits}/extern/six.py | 0
{lib/pyfits => pyfits}/file.py | 235 +++---
{lib/pyfits => pyfits}/fitsrec.py | 874 ++++++++++++++-------
{lib/pyfits => pyfits}/hdu/__init__.py | 6 +-
{lib/pyfits => pyfits}/hdu/base.py | 123 ++-
{lib/pyfits => pyfits}/hdu/compressed.py | 133 ++--
{lib/pyfits => pyfits}/hdu/groups.py | 127 +--
{lib/pyfits => pyfits}/hdu/hdulist.py | 145 ++--
{lib/pyfits => pyfits}/hdu/image.py | 444 ++++++-----
{lib/pyfits => pyfits}/hdu/nonstandard.py | 0
{lib/pyfits => pyfits}/hdu/streaming.py | 52 +-
{lib/pyfits => pyfits}/hdu/table.py | 491 ++++++++----
{lib/pyfits => pyfits}/header.py | 447 ++---------
{lib/pyfits => pyfits}/py3compat.py | 164 ++--
{lib/pyfits => pyfits}/scripts/__init__.py | 4 -
{lib/pyfits => pyfits}/scripts/fitscheck.py | 8 +-
{lib/pyfits => pyfits}/scripts/fitsdiff.py | 52 +-
pyfits/scripts/fitsheader.py | 255 ++++++
pyfits/scripts/fitsinfo.py | 64 ++
{lib/pyfits => pyfits}/tests/__init__.py | 0
{lib/pyfits => pyfits}/tests/data/arange.fits | Bin
{lib/pyfits => pyfits}/tests/data/ascii.fits | 0
.../table.fits => pyfits/tests/data/blank.fits | Bin 8640 -> 5760 bytes
{lib/pyfits => pyfits}/tests/data/checksum.fits | 0
{lib/pyfits => pyfits}/tests/data/comp.fits | 0
{lib/pyfits => pyfits}/tests/data/fixed-1890.fits | 0
pyfits/tests/data/memtest.fits | 1 +
.../tests/data/o4sp040b0_raw.fits | 0
.../tests/data/random_groups.fits | 0
{lib/pyfits => pyfits}/tests/data/scale.fits | Bin
{lib/pyfits => pyfits}/tests/data/stddata.fits | Bin
{lib/pyfits => pyfits}/tests/data/table.fits | Bin
{lib/pyfits => pyfits}/tests/data/tb.fits | Bin
.../data/table.fits => pyfits/tests/data/tdim.fits | Bin 8640 -> 8640 bytes
{lib/pyfits => pyfits}/tests/data/test0.fits | 0
{lib/pyfits => pyfits}/tests/data/zerowidth.fits | 0
{lib/pyfits => pyfits}/tests/test_checksum.py | 68 +-
{lib/pyfits => pyfits}/tests/test_core.py | 319 ++++++--
{lib/pyfits => pyfits}/tests/test_diff.py | 49 ++
{lib/pyfits => pyfits}/tests/test_division.py | 3 +-
{lib/pyfits => pyfits}/tests/test_groups.py | 13 +
{lib/pyfits => pyfits}/tests/test_hdulist.py | 33 +-
{lib/pyfits => pyfits}/tests/test_header.py | 344 ++++----
{lib/pyfits => pyfits}/tests/test_image.py | 309 ++++++--
{lib/pyfits => pyfits}/tests/test_nonstandard.py | 0
{lib/pyfits => pyfits}/tests/test_structured.py | 0
{lib/pyfits => pyfits}/tests/test_table.py | 524 +++++++++++-
{lib/pyfits => pyfits}/tests/test_uint.py | 0
{lib/pyfits => pyfits}/tests/test_util.py | 2 +-
pyfits/tests/util.py | 71 ++
{lib/pyfits => pyfits}/util.py | 593 +++++++++-----
{lib/pyfits => pyfits}/verify.py | 1 -
{lib/pyfits => pyfits}/version.py | 6 +-
scripts/fitshead | 8 +
setup.cfg | 13 +-
setup.py | 2 +-
setup_hooks.py | 16 +
src/compressionmodule.c | 53 +-
tox.ini | 2 +-
135 files changed, 7437 insertions(+), 6314 deletions(-)
diff --cc debian/.git-dpm
index fd3683c,0000000..0b6d423
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- ca5208625a3c28f08f11443fe1265066417e85a7
- ca5208625a3c28f08f11443fe1265066417e85a7
- 1484822ff21f8e3819649759317d4795a4189d5a
++70fe4dac3f68c3eed369d42e6a49e7865db8b250
++70fe4dac3f68c3eed369d42e6a49e7865db8b250
++fc71929135ce8db757eac89a965beb176b28c08b
+fc71929135ce8db757eac89a965beb176b28c08b
+pyfits_3.4.orig.tar.gz
+3fa0e0c51f2a2a30384aea0de226cf5da05fce57
+1692414
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/01-system-cfitsio.diff
index 4b331c5,0000000..f2ce935
mode 100644,000000..100644
--- a/debian/patches/01-system-cfitsio.diff
+++ b/debian/patches/01-system-cfitsio.diff
@@@ -1,176 -1,0 +1,176 @@@
- From 5e2a1cb7eb80f7fcc6a1848c67af4df9ff192a13 Mon Sep 17 00:00:00 2001
++From 70fe4dac3f68c3eed369d42e6a49e7865db8b250 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at 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 ed28b09..ca8f195 100644
++index 3a05c62..3a64f33 100644
+--- a/setup.cfg
++++ b/setup.cfg
- @@ -37,81 +37,81 @@ scripts =
++@@ -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
- @@ -122,6 +122,7 @@ extra_compile_args =
++@@ -125,6 +125,7 @@ extra_compile_args =
+ -Wno-unused
+ -Wno-comments
+ -Wno-switch
++libraries = cfitsio
+ optional = True
+ fail_message =
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --cc debian/patches/series
index 0302110,0000000..0d1ca88
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,1 @@@
+01-system-cfitsio.diff
- 02-fitscheck-exception.diff
- 03-testsuite-ignore-deprecated.diff
- 04-replace-inspect-by-funcsigs.diff
- 05-checksum-32-bit.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyfits.git
More information about the Python-modules-commits
mailing list