Skip to content

Commit

Permalink
Merge pull request #404 from esheldon/cfitsio-4.4.1-20240617
Browse files Browse the repository at this point in the history
move to cfitsio-4.4.1-20240617, bump to version 1.2.4
  • Loading branch information
esheldon authored Jun 18, 2024
2 parents 90c286c + 66a1217 commit 5b2cb45
Show file tree
Hide file tree
Showing 162 changed files with 46 additions and 258 deletions.
7 changes: 7 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
version 1.2.4
-------------

Changes

- use cfitsio-4.4.1-20240617 which reverts to a free license

version 1.2.3
-------------

Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include *.txt
include README.md
recursive-include cfitsio-4.4.0 *
recursive-include cfitsio-4.4.1-20240617 *
recursive-include patches *
recursive-include fitsio/test_images *
recursive-include zlib *
249 changes: 0 additions & 249 deletions cfitsio-4.4.0/licenses/NASA_Open_Source_Agreement_1.3.txt

This file was deleted.

1 change: 1 addition & 0 deletions cfitsio-4.4.1-20240617/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*~
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PROJECT(CFITSIO
# Define project version
SET(${PROJECT_NAME}_MAJOR 4)
SET(${PROJECT_NAME}_MINOR 4)
SET(${PROJECT_NAME}_MICRO 0)
SET(${PROJECT_NAME}_MICRO 1)
SET(${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_MAJOR}.${${PROJECT_NAME}_MINOR}.${${PROJECT_NAME}_MICRO})
SET(LIB_NAME cfitsio)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2575,7 +2575,7 @@ CFITSIO_MAJOR=4

CFITSIO_MINOR=4

CFITSIO_MICRO=0
CFITSIO_MICRO=1

# Increment soname each time the interface changes:
CFITSIO_SONAME=10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ AC_CANONICAL_TARGET([])
#--------------------------------------------------------------------
AC_SUBST(CFITSIO_MAJOR,4)
AC_SUBST(CFITSIO_MINOR,4)
AC_SUBST(CFITSIO_MICRO,0)
AC_SUBST(CFITSIO_MICRO,1)
# Increment soname each time the interface changes:
AC_SUBST(CFITSIO_SONAME,10)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Log of Changes Made to CFITSIO

Version 4.4.1 - Jun 2024

- Removed NOSA license and restored previous license file

Version 4.4.0 - Feb 2024

- Reorganization of helper utility code; added fitsverify
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added cfitsio-4.4.1-20240617/docs/fpackguide.odt
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions cfitsio-4.4.0/fitsio.h → cfitsio-4.4.1-20240617/fitsio.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ SERVICES PROVIDED HEREUNDER."
#ifndef _FITSIO_H
#define _FITSIO_H

#define CFITSIO_VERSION 4.4.0
#define CFITSIO_VERSION 4.4.1
/* Minor and micro numbers must not exceed 99 under current method
of version representataion in ffvers(). */
#define CFITSIO_MICRO 0
#define CFITSIO_MICRO 1
#define CFITSIO_MINOR 4
#define CFITSIO_MAJOR 4
#define CFITSIO_SONAME 10
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
25 changes: 25 additions & 0 deletions cfitsio-4.4.1-20240617/licenses/License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Copyright (Unpublished--all rights reserved under the copyright laws of
the United States), U.S. Government as represented by the Administrator
of the National Aeronautics and Space Administration. No copyright is
claimed in the United States under Title 17, U.S. Code.

Permission to freely use, copy, modify, and distribute this software
and its documentation without fee is hereby granted, provided that this
copyright notice and disclaimer of warranty appears in all copies.

DISCLAIMER:

THE SOFTWARE IS PROVIDED 'AS IS' WITHOUT ANY WARRANTY OF ANY KIND,
EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO,
ANY WARRANTY THAT THE SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY
IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, AND FREEDOM FROM INFRINGEMENT, AND ANY WARRANTY THAT THE
DOCUMENTATION WILL CONFORM TO THE SOFTWARE, OR ANY WARRANTY THAT THE
SOFTWARE WILL BE ERROR FREE. IN NO EVENT SHALL NASA BE LIABLE FOR ANY
DAMAGES, INCLUDING, BUT NOT LIMITED TO, DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES, ARISING OUT OF, RESULTING FROM, OR IN ANY WAY
CONNECTED WITH THIS SOFTWARE, WHETHER OR NOT BASED UPON WARRANTY,
CONTRACT, TORT , OR OTHERWISE, WHETHER OR NOT INJURY WAS SUSTAINED BY
PERSONS OR PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED
FROM, OR AROSE OUT OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR
SERVICES PROVIDED HEREUNDER.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion fitsio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
usage.
"""

__version__ = '1.2.3'
__version__ = '1.2.4'

from . import fitslib

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@


class build_ext_subclass(build_ext):
cfitsio_version = '4.4.0'
cfitsio_version = '4.4.1-20240617'
cfitsio_dir = 'cfitsio-%s' % cfitsio_version

def finalize_options(self):
Expand Down Expand Up @@ -318,7 +318,7 @@ def check_system_cfitsio_objects(self, obj_name):

setup(
name="fitsio",
version="1.2.3",
version="1.2.4",
description=description,
long_description=long_description,
long_description_content_type='text/markdown; charset=UTF-8; variant=GFM',
Expand Down

0 comments on commit 5b2cb45

Please sign in to comment.