Repository navigation
Commit 00b4769
committed
Merge branch 'fits/astropy' into astropy
This merges up through r1927 from pyfits' trunk in SVN. Closes the following
issues in Astropy:
Closes astropy#339 astropy.io.fits.Header totextfile and Header.__init__ disagree on 'endcard' convention
Closes astropy#318 Move io.fits external C dependencies into cextern
Conflicts:
README.txt
astropy/io/fits/src/compress.c
astropy/io/fits/src/crc32.h
astropy/io/fits/src/deflate.h
astropy/io/fits/src/fits_hcompress.c
astropy/io/fits/src/fits_hdecompress.c
astropy/io/fits/src/fitsio.c
astropy/io/fits/src/fitsio.h
astropy/io/fits/src/inffast.c
astropy/io/fits/src/inffast.h
astropy/io/fits/src/inffixed.h
astropy/io/fits/src/inflate.h
astropy/io/fits/src/inftrees.c
astropy/io/fits/src/inftrees.h
astropy/io/fits/src/pliocomp.c
astropy/io/fits/src/quantize.c
astropy/io/fits/src/ricecomp.c
astropy/io/fits/src/ricecomp.h
astropy/io/fits/src/trees.c
astropy/io/fits/src/trees.h
astropy/io/fits/src/zlib.c
astropy/io/fits/src/zlib.h
astropy/io/fits/src/zutil.h
cextern/cfitsio/crc32.h
cextern/cfitsio/deflate.h
cextern/cfitsio/fits_hcompress.c
cextern/cfitsio/fits_hdecompress.c
cextern/cfitsio/inffast.c
cextern/cfitsio/inffixed.h
cextern/cfitsio/inftrees.c
cextern/cfitsio/pliocomp.c
cextern/cfitsio/quantize.c
cextern/cfitsio/ricecomp.c
cextern/cfitsio/trees.c
cextern/cfitsio/trees.h
cextern/cfitsio/zutil.h
setup.cfg
src/crc32.h
src/deflate.h
src/fits_hcompress.c
src/fits_hdecompress.c
src/inffast.c
src/inffixed.h
src/inftrees.c
src/pliocomp.c
src/quantize.c
src/ricecomp.c
src/trees.c
src/trees.h
src/zutil.h
tox.ini
Conflicts:
astropy/io/fits/diff.py
astropy/io/fits/hdu/base.py
astropy/io/fits/hdu/compressed.py
astropy/io/fits/hdu/image.py
astropy/io/fits/src/compressionmodule.c
astropy/io/fits/tests/cfitsio_verify.c
astropy/io/fits/tests/test_core.py
astropy/io/fits/tests/test_header.py
astropy/io/fits/tests/test_image.py
astropy/io/fits/tests/test_uint.py1 parent 1fd58c4 commit 00b4769
128 files changed
Lines changed: 138220 additions & 14753 deletions
File tree
- astropy/io/fits
- hdu
- src
- tests
- cextern/cfitsio
- docs/io/fits
- appendix
- usage
- licenses
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
229 | 229 | | |
230 | 230 | | |
231 | 231 | | |
232 | | - | |
| 232 | + | |
233 | 233 | | |
234 | 234 | | |
235 | 235 | | |
236 | | - | |
| 236 | + | |
237 | 237 | | |
238 | 238 | | |
239 | 239 | | |
| |||
382 | 382 | | |
383 | 383 | | |
384 | 384 | | |
385 | | - | |
| 385 | + | |
386 | 386 | | |
387 | | - | |
| 387 | + | |
388 | 388 | | |
389 | 389 | | |
390 | 390 | | |
391 | | - | |
| 391 | + | |
392 | 392 | | |
393 | 393 | | |
394 | 394 | | |
| |||
412 | 412 | | |
413 | 413 | | |
414 | 414 | | |
| 415 | + | |
415 | 416 | | |
416 | 417 | | |
417 | 418 | | |
| |||
596 | 597 | | |
597 | 598 | | |
598 | 599 | | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
599 | 606 | | |
600 | 607 | | |
601 | 608 | | |
| |||
774 | 781 | | |
775 | 782 | | |
776 | 783 | | |
| 784 | + | |
| 785 | + | |
777 | 786 | | |
778 | 787 | | |
779 | 788 | | |
780 | 789 | | |
781 | 790 | | |
782 | 791 | | |
783 | 792 | | |
| 793 | + | |
784 | 794 | | |
785 | 795 | | |
786 | 796 | | |
787 | 797 | | |
788 | 798 | | |
| 799 | + | |
| 800 | + | |
789 | 801 | | |
790 | 802 | | |
791 | 803 | | |
| |||
802 | 814 | | |
803 | 815 | | |
804 | 816 | | |
| 817 | + | |
805 | 818 | | |
806 | 819 | | |
807 | 820 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
988 | 988 | | |
989 | 989 | | |
990 | 990 | | |
991 | | - | |
| 991 | + | |
992 | 992 | | |
993 | 993 | | |
994 | 994 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
301 | 301 | | |
302 | 302 | | |
303 | 303 | | |
304 | | - | |
| 304 | + | |
305 | 305 | | |
306 | 306 | | |
307 | 307 | | |
| |||
1025 | 1025 | | |
1026 | 1026 | | |
1027 | 1027 | | |
| 1028 | + | |
| 1029 | + | |
| 1030 | + | |
| 1031 | + | |
| 1032 | + | |
1028 | 1033 | | |
1029 | 1034 | | |
1030 | 1035 | | |
| |||
1119 | 1124 | | |
1120 | 1125 | | |
1121 | 1126 | | |
1122 | | - | |
1123 | | - | |
1124 | | - | |
1125 | | - | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
| 1130 | + | |
1126 | 1131 | | |
1127 | 1132 | | |
1128 | 1133 | | |
| |||
1177 | 1182 | | |
1178 | 1183 | | |
1179 | 1184 | | |
1180 | | - | |
| 1185 | + | |
1181 | 1186 | | |
1182 | 1187 | | |
1183 | 1188 | | |
| |||
1206 | 1211 | | |
1207 | 1212 | | |
1208 | 1213 | | |
1209 | | - | |
| 1214 | + | |
1210 | 1215 | | |
1211 | 1216 | | |
1212 | 1217 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
178 | 178 | | |
179 | 179 | | |
180 | 180 | | |
| 181 | + | |
181 | 182 | | |
182 | 183 | | |
183 | 184 | | |
| |||
193 | 194 | | |
194 | 195 | | |
195 | 196 | | |
| 197 | + | |
196 | 198 | | |
197 | 199 | | |
198 | 200 | | |
| |||
207 | 209 | | |
208 | 210 | | |
209 | 211 | | |
| 212 | + | |
210 | 213 | | |
211 | 214 | | |
212 | 215 | | |
| |||
362 | 365 | | |
363 | 366 | | |
364 | 367 | | |
| 368 | + | |
365 | 369 | | |
366 | 370 | | |
367 | 371 | | |
| |||
373 | 377 | | |
374 | 378 | | |
375 | 379 | | |
376 | | - | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
377 | 393 | | |
378 | | - | |
379 | | - | |
| 394 | + | |
| 395 | + | |
380 | 396 | | |
381 | 397 | | |
382 | 398 | | |
| |||
546 | 562 | | |
547 | 563 | | |
548 | 564 | | |
549 | | - | |
550 | 565 | | |
551 | 566 | | |
552 | 567 | | |
| |||
564 | 579 | | |
565 | 580 | | |
566 | 581 | | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
567 | 587 | | |
568 | 588 | | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
569 | 595 | | |
570 | | - | |
571 | 596 | | |
572 | 597 | | |
573 | 598 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
| 116 | + | |
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
126 | 136 | | |
127 | 137 | | |
128 | 138 | | |
129 | 139 | | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
134 | 144 | | |
135 | 145 | | |
136 | 146 | | |
| |||
689 | 699 | | |
690 | 700 | | |
691 | 701 | | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
| 724 | + | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
692 | 730 | | |
693 | 731 | | |
694 | 732 | | |
| |||
832 | 870 | | |
833 | 871 | | |
834 | 872 | | |
835 | | - | |
| 873 | + | |
836 | 874 | | |
837 | 875 | | |
838 | 876 | | |
| |||
924 | 962 | | |
925 | 963 | | |
926 | 964 | | |
| 965 | + | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
| 970 | + | |
| 971 | + | |
| 972 | + | |
| 973 | + | |
| 974 | + | |
| 975 | + | |
| 976 | + | |
| 977 | + | |
927 | 978 | | |
928 | 979 | | |
929 | 980 | | |
| |||
1402 | 1453 | | |
1403 | 1454 | | |
1404 | 1455 | | |
1405 | | - | |
1406 | | - | |
1407 | | - | |
1408 | | - | |
1409 | | - | |
1410 | | - | |
1411 | | - | |
1412 | | - | |
1413 | | - | |
1414 | | - | |
1415 | | - | |
1416 | | - | |
1417 | | - | |
1418 | | - | |
1419 | | - | |
1420 | | - | |
1421 | | - | |
1422 | | - | |
1423 | | - | |
1424 | | - | |
1425 | | - | |
1426 | | - | |
1427 | | - | |
1428 | | - | |
1429 | | - | |
1430 | | - | |
1431 | | - | |
1432 | | - | |
1433 | | - | |
1434 | | - | |
1435 | | - | |
1436 | | - | |
1437 | 1456 | | |
1438 | 1457 | | |
1439 | 1458 | | |
| |||
1469 | 1488 | | |
1470 | 1489 | | |
1471 | 1490 | | |
| 1491 | + | |
1472 | 1492 | | |
1473 | 1493 | | |
1474 | 1494 | | |
| |||
0 commit comments