Fix SPDF tag to GPL-3.0-or-later (fixes #146)

* Remove references to EMIR DRP, updated to PyEmir
guaix-ucm · Dec 11, 2023 · fe44b43 · fe44b43
1 parent 7dc8a10
commit fe44b43
Show file tree

Hide file tree

Showing 104 changed files with 115 additions and 106 deletions.
diff --git a/src/emirdrp/__init__.py b/src/emirdrp/__init__.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/core/__init__.py b/src/emirdrp/core/__init__.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/core/correctors.py b/src/emirdrp/core/correctors.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/core/extra.py b/src/emirdrp/core/extra.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/core/recipe.py b/src/emirdrp/core/recipe.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/core/utils.py b/src/emirdrp/core/utils.py
@@ -1,3 +1,11 @@
+#
+# Copyright 2020-2023 Universidad Complutense de Madrid
+#
+# This file is part of PyEmir
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+# License-Filename: LICENSE.txt
+#
 
 import numpy
 import math

diff --git a/src/emirdrp/datamodel.py b/src/emirdrp/datamodel.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/decorators.py b/src/emirdrp/decorators.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/instrument/channels.py b/src/emirdrp/instrument/channels.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/instrument/components/csu.py b/src/emirdrp/instrument/components/csu.py
@@ -1,9 +1,9 @@
 #
 # Copyright 2019-2023 Universidad Complutense de Madrid
 #
-# This file is part of EMIR DRP
+# This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/instrument/components/dtu.py b/src/emirdrp/instrument/components/dtu.py
@@ -1,9 +1,9 @@
 #
 # Copyright 2019-2023 Universidad Complutense de Madrid
 #
-# This file is part of EMIR DRP
+# This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 import astropy.wcs

diff --git a/src/emirdrp/instrument/components/dtuaxis.py b/src/emirdrp/instrument/components/dtuaxis.py
@@ -1,9 +1,9 @@
 #
 # Copyright 2019-2023 Universidad Complutense de Madrid
 #
-# This file is part of EMIR DRP
+# This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/instrument/components/tests/test_dtu.py b/src/emirdrp/instrument/components/tests/test_dtu.py
@@ -116,6 +116,7 @@ def test_dtu_average2_2(hdr1, hdr2):
         calc = 0.5 * (getattr(dtuconf1, name).coor_0 + getattr(dtuconf2, name).coor_0)
         assert math.isclose(getattr(dtuconf, name).coor_0, calc)
 
+
 def test_dtu_hash():
     header = DTU_HEADER_EXAMPLE
     dtuconf = DtuConf.from_header(header)

diff --git a/src/emirdrp/instrument/constants/__init__.py b/src/emirdrp/instrument/constants/__init__.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/instrument/csu_configuration.py b/src/emirdrp/instrument/csu_configuration.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/instrument/csuconf.py b/src/emirdrp/instrument/csuconf.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/instrument/distortions.py b/src/emirdrp/instrument/distortions.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/instrument/tests/dtuheader.py b/src/emirdrp/instrument/tests/dtuheader.py
@@ -1,9 +1,9 @@
 #
 # Copyright 2023 Universidad Complutense de Madrid
 #
-# This file is part of EMIR DRP
+# This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/loader.py b/src/emirdrp/loader.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/preprocess.py b/src/emirdrp/preprocess.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/bardetect.py b/src/emirdrp/processing/bardetect.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/bars.py b/src/emirdrp/processing/bars.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/checkers.py b/src/emirdrp/processing/checkers.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/combine.py b/src/emirdrp/processing/combine.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/corr.py b/src/emirdrp/processing/corr.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/flatfield.py b/src/emirdrp/processing/flatfield.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/info.py b/src/emirdrp/processing/info.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/apply_rectwv_coeff.py b/src/emirdrp/processing/wavecal/apply_rectwv_coeff.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/get_islitlet.py b/src/emirdrp/processing/wavecal/get_islitlet.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/islitlet_progress.py b/src/emirdrp/processing/wavecal/islitlet_progress.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/median_slitlets_rectified.py b/src/emirdrp/processing/wavecal/median_slitlets_rectified.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/overplot_boundary_model.py b/src/emirdrp/processing/wavecal/overplot_boundary_model.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/rectwv_coeff_add_longslit_model.py b/src/emirdrp/processing/wavecal/rectwv_coeff_add_longslit_model.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/rectwv_coeff_from_arc_image.py b/src/emirdrp/processing/wavecal/rectwv_coeff_from_arc_image.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/rectwv_coeff_from_mos_library.py b/src/emirdrp/processing/wavecal/rectwv_coeff_from_mos_library.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/rectwv_coeff_to_ds9.py b/src/emirdrp/processing/wavecal/rectwv_coeff_to_ds9.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/refine_rectwv_coeff.py b/src/emirdrp/processing/wavecal/refine_rectwv_coeff.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/rescale_array_z1z2.py b/src/emirdrp/processing/wavecal/rescale_array_z1z2.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/retrieve_catlines.py b/src/emirdrp/processing/wavecal/retrieve_catlines.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/set_wv_parameters.py b/src/emirdrp/processing/wavecal/set_wv_parameters.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/slitlet2d.py b/src/emirdrp/processing/wavecal/slitlet2d.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #
 

diff --git a/src/emirdrp/processing/wavecal/slitlet2darc.py b/src/emirdrp/processing/wavecal/slitlet2darc.py
@@ -3,7 +3,7 @@
 #
 # This file is part of PyEmir
 #
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # License-Filename: LICENSE.txt
 #