dkist-processing-common 10.7.1rc1__py3-none-any.whl → 10.8.0rc1__py3-none-any.whl

changelog/222.bugfix.rst

@@ -0,0 +1 @@
+Modify usage of CompImageHeader to support astropy 7.

changelog/222.feature.2.rst

@@ -0,0 +1 @@
+Bump numpy version to cross the 2.0.0 release.

changelog/222.feature.rst

@@ -0,0 +1 @@
+Add checksum verification to the hdu decoder.

dkist_processing_common/codecs/fits.py

@@ -32,7 +32,7 @@ def fits_hdulist_encoder(hdu_list: fits.HDUList) -> bytes:
 
 def fits_hdu_decoder(path: Path) -> fits.PrimaryHDU | fits.CompImageHDU:
     """Read a Path with `fits` to produce an `HDUList`."""
-    hdu_list = fits.open(path)
+    hdu_list = fits.open(path, checksum=True)
     return _extract_hdu(hdu_list)
 
 

dkist_processing_common/tasks/write_l1.py

@@ -512,6 +512,6 @@ class WriteL1Frame(WorkflowTaskBase, MetadataStoreMixin, ABC):
     @staticmethod
     def remove_invalid_r0_values(header: fits.Header) -> fits.Header:
         """Remove the Fried parameter r0 from the header if the AO is not locked."""
-        if not header["AO_LOCK"]:
+        if header.get("AO_LOCK") is not True:
             header.pop("ATMOS_R0", None)
         return header

dkist_processing_common/tests/test_write_l1.py

@@ -157,8 +157,9 @@ def write_l1_task(request, recipe_run_id, tmp_path):
 @pytest.fixture(
     scope="function",
     params=[
-        pytest.param(True, id="AO_lock_on"),
-        pytest.param(False, id="AO_lock_off"),
+        pytest.param({"AO_LOCK": True}, id="AO_LOCK_True"),
+        pytest.param({"AO_LOCK": False}, id="AO_LOCK_False"),
+        pytest.param({}, id="AO_LOCK_missing"),
     ],
 )
 def write_l1_task_no_data(request, recipe_run_id, tmp_path, complete_common_header):
@@ -171,7 +172,8 @@ def write_l1_task_no_data(request, recipe_run_id, tmp_path, complete_common_head
     ):
         task.scratch = WorkflowFileSystem(recipe_run_id=recipe_run_id, scratch_base_path=tmp_path)
         header = complete_common_header
-        header["AO_LOCK"] = request.param
+        header.pop("AO_LOCK", None)  # If it's not required, shouldn't be here in the first place??
+        header.update(request.param)
         fried_parameter = 0.2
         header["ATMOS_R0"] = fried_parameter
         hdu = fits.PrimaryHDU(data=np.random.random(size=(1, 1, 1)) * 1, header=header)
@@ -428,7 +430,8 @@ def test_rice_compression_with_specified_tile_size(write_l1_task, mocker):
     files = list(task.read(tags=[Tag.frame(), Tag.output()]))
     for file in files:
         hdul = fits.open(file)
-        comp_header = hdul[1]._header
+        bintable = hdul[1]._get_bintable_without_data()
+        comp_header = bintable.header
         data_shape = list(hdul[1].data.shape)
         data_shape.reverse()
         for i, dim in enumerate(data_shape):
@@ -453,7 +456,8 @@ def test_rice_compression_with_default_tile_size(write_l1_task, mocker):
     files = list(task.read(tags=[Tag.frame(), Tag.output()]))
     for file in files:
         hdul = fits.open(file)
-        comp_header = hdul[1]._header
+        bintable = hdul[1]._get_bintable_without_data()
+        comp_header = bintable.header
         data_shape = list(hdul[1].data.shape)
         data_shape.reverse()
         assert comp_header["ZTILE1"] == data_shape[0]
@@ -604,12 +608,11 @@ def test_check_r0_ao_lock(write_l1_task_no_data):
     """
     task, header, r0 = write_l1_task_no_data
     header_after_check = task.remove_invalid_r0_values(header=header)
-    if header["AO_LOCK"]:
+    if header.get("AO_LOCK"):
         assert header_after_check["ATMOS_R0"] == header["ATMOS_R0"]
         assert header["ATMOS_R0"] == r0
         assert header["AO_LOCK"]
-    if not header["AO_LOCK"]:
-        with pytest.raises(KeyError) as ke:
+    else:
+        with pytest.raises(KeyError, match="Keyword 'ATMOS_R0' not found"):
             invalid_r0 = header_after_check["ATMOS_R0"]
-        assert "Keyword 'ATMOS_R0' not found" in str(ke)
-        assert not header["AO_LOCK"]
+        assert header.get("AO_LOCK") != True

{dkist_processing_common-10.7.1rc1.dist-info → dkist_processing_common-10.8.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 10.7.1rc1
+Version: 10.8.0rc1
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 Requires-Dist: asdf<4.0.0,>=3.5.0
-Requires-Dist: astropy<7.0.0,>=6.0.0
+Requires-Dist: astropy>=7.0.0
 Requires-Dist: dkist-fits-specifications<5.0,>=4.0.0
 Requires-Dist: dkist-header-validator<6.0,>=5.0.0
 Requires-Dist: dkist-processing-core==5.1.0
@@ -26,7 +26,7 @@ Requires-Dist: gqlclient[pydantic]==1.2.3
 Requires-Dist: sqids==0.5.1
 Requires-Dist: matplotlib>=3.4
 Requires-Dist: moviepy>=2.0.0
-Requires-Dist: numpy>=1.20.2
+Requires-Dist: numpy>=2.2.5
 Requires-Dist: object-clerk==0.1.1
 Requires-Dist: pandas>=1.4.2
 Requires-Dist: pillow>=10.2.0
@@ -43,7 +43,7 @@ Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-mock; extra == "test"
 Requires-Dist: hypothesis; extra == "test"
 Requires-Dist: towncrier; extra == "test"
-Requires-Dist: dkist-data-simulator>=5.0.0; extra == "test"
+Requires-Dist: dkist-data-simulator>=5.2.6; extra == "test"
 Requires-Dist: dkist-processing-common[inventory]; extra == "test"
 Requires-Dist: dkist-processing-common[asdf]; extra == "test"
 Requires-Dist: dkist-processing-common[quality]; extra == "test"

{dkist_processing_common-10.7.1rc1.dist-info → dkist_processing_common-10.8.0rc1.dist-info}/RECORD

@@ -1,5 +1,7 @@
 changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-changelog/248.bugfix.rst,sha256=zpa1QJfaqZ5dbakRBvlGQsp_B2i66oBFez2jAFFHZwM,118
+changelog/222.bugfix.rst,sha256=PXXz9YIyqtl2icpbtDRK0Zh5fXQjpMuKA1G5fd8LAFc,54
+changelog/222.feature.2.rst,sha256=-6OdS9g1PSiUnyzMkz6orYiOmOnpD3Hcfy3KDYUdLEQ,47
+changelog/222.feature.rst,sha256=X9TyBOkXdz3Ze0BfRi7awpk0SM5ljTJhjOeQZb-J5Xo,46
 dkist_processing_common/__init__.py,sha256=490Fwm_GgqpwriQlsYfKcLUZNhZ6GkINtJqcYSIEKoU,319
 dkist_processing_common/config.py,sha256=IcpaD_NvHZU-aLlUNOTdRC4V7ADIvVQwrZ2dHhIr4NY,4247
 dkist_processing_common/manual.py,sha256=IH72QxdGlr-BuWq2EDrfC9yStegO-elUWrobQqT4710,7042
@@ -11,7 +13,7 @@ dkist_processing_common/_util/tags.py,sha256=8r62_-x3xpbCoCu5dd09Q2u-OYzYiML6SlP
 dkist_processing_common/codecs/__init__.py,sha256=du1iitvsudSSOMENSywXmXSLOlvIocJsPbvfEcyqFNc,159
 dkist_processing_common/codecs/asdf.py,sha256=2GHCFOZk1j-ml4EolXac_sUzk7aPYJUGqKYxZk4mG_c,1046
 dkist_processing_common/codecs/bytes.py,sha256=tiVEUu_Gzc5NfW1_qsJtHDlYAZzgIqA7f4cfAwN734k,495
-dkist_processing_common/codecs/fits.py,sha256=GH_K5_w0sjGY3_Yokw4jBhwxvEk05WYD5V3Hxb7odUs,2331
+dkist_processing_common/codecs/fits.py,sha256=0D6tDvt13OhVXok4tS8VGHdd8OSV8DrRet8VCD6Zt3g,2346
 dkist_processing_common/codecs/iobase.py,sha256=r0ImN0CxfjAnfMflNv7w2pGDp2i6EQg0p2OaEkE82pk,977
 dkist_processing_common/codecs/json.py,sha256=OWXzoFWccJiojkiKSeDrMdL9f7EpdNIOMvO9YBBg-Yg,939
 dkist_processing_common/codecs/path.py,sha256=LU5Kh1ew2PQI9hcpzbnZkE47k-zAMZDDV4cgqHRcDkY,197
@@ -59,7 +61,7 @@ dkist_processing_common/tasks/teardown.py,sha256=e4LKnphJDYDVDAez2tH7MxpZgCmxYsK
 dkist_processing_common/tasks/transfer_input_data.py,sha256=afEW0glpCFMZRj90nFtQo_4XOQ4CuoOh86jahP6a-a0,5548
 dkist_processing_common/tasks/trial_catalog.py,sha256=Y3DKstRfMS8nWWtJFMB0MUVPlZ1jWS_2jhJGMWwxy50,8748
 dkist_processing_common/tasks/trial_output_data.py,sha256=aI_aRuu0qVO8zFGrr_9baxx9i3jUEHZSmsmbO6ytlkE,6960
-dkist_processing_common/tasks/write_l1.py,sha256=Jw8zQjlYjBQru3m1SB_ZDmicMkDRiUihy9VdwehvZc0,22683
+dkist_processing_common/tasks/write_l1.py,sha256=8KQ5LWa15mmjcoN0EgyaeLJS2qxeAowU5MC8IEIt4l4,22695
 dkist_processing_common/tasks/mixin/__init__.py,sha256=-g-DQbU7m1bclJYuFe3Yh757V-35GIDTbstardKQ7nU,68
 dkist_processing_common/tasks/mixin/globus.py,sha256=QAV8VElxMAqxJ2KSB_bJaraceovYfjHXjOdocrTCkIA,6592
 dkist_processing_common/tasks/mixin/input_dataset.py,sha256=dkW5vf_QPgWedHO_Lf9GjBxr1QrUCKs6gIXufUTi7GE,6813
@@ -101,7 +103,7 @@ dkist_processing_common/tests/test_transfer_l1_output_data.py,sha256=27PifkyH3RZ
 dkist_processing_common/tests/test_trial_catalog.py,sha256=SZ-nyn0MXU9Lkg_94FbKER_cwiGoi06GYlzF_3AmvKg,6802
 dkist_processing_common/tests/test_trial_output_data.py,sha256=cBCj0kXyF5NEMzKh6zPVksdoXyE8ju1opJgWgjdcJWA,12790
 dkist_processing_common/tests/test_workflow_task_base.py,sha256=Z5aPW5LQtS0UWJiYho4X0r-2gPLfzpkmMwfmaoFLjMg,10517
-dkist_processing_common/tests/test_write_l1.py,sha256=R_ljJdSC4hCHS_mLV6rKE7PVfpDWCaMXoN6n45QJNWM,21951
+dkist_processing_common/tests/test_write_l1.py,sha256=xdPqIeS7brVUzDD0XmCVKc4N4QUbaUc0ENMFBwCYU2c,22203
 docs/Makefile,sha256=qnlVz6PuBqE39NfHWuUnHhNEA-EFgT2-WJNNNy9ttfk,4598
 docs/changelog.rst,sha256=S2jPASsWlQxSlAPqdvNrYvhk9k3FcFWNXFNDYXBSjl4,120
 docs/conf.py,sha256=FkX575cqTqZGCcLAjg2MlvE8Buj1Vt3CpHNgZxG256E,1890
@@ -110,7 +112,7 @@ docs/landing_page.rst,sha256=aPAuXFhBx73lEZ59B6E6JXxkK0LlxzD0n-HXqHrfumQ,746
 docs/make.bat,sha256=mBAhtURwhQ7yc95pqwJzlhqBSvRknr1aqZ5s8NKvdKs,4513
 docs/requirements.txt,sha256=Kbl_X4c7RQZw035YTeNB63We6I7pvXFU4T0Uflp2yDY,29
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_common-10.7.1rc1.dist-info/METADATA,sha256=Q9cp_Hd28cRGUf8P_YPPpp67BNRg7uN61WmqbLg3_Bg,7157
-dkist_processing_common-10.7.1rc1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dkist_processing_common-10.7.1rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
-dkist_processing_common-10.7.1rc1.dist-info/RECORD,,
+dkist_processing_common-10.8.0rc1.dist-info/METADATA,sha256=ROcyuGFP8aFpV68p9dryGzts3Q4XOSQxRz-LxUOjem0,7149
+dkist_processing_common-10.8.0rc1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+dkist_processing_common-10.8.0rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
+dkist_processing_common-10.8.0rc1.dist-info/RECORD,,

{dkist_processing_common-10.7.1rc1.dist-info → dkist_processing_common-10.8.0rc1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

changelog/248.bugfix.rst

@@ -1 +0,0 @@
-Fix a bug exposed by updates in the `dkist-inventory` package that did not manage HISTORY or COMMENT cards correctly.