dkist-processing-common 10.7.1rc1__tar.gz → 10.8.0rc1__tar.gz

{dkist_processing_common-10.7.1rc1 → dkist_processing_common-10.8.0rc1}/CHANGELOG.rst

@@ -1,3 +1,21 @@
+v10.7.2 (2025-04-21)
+====================
+
+Bugfixes
+--------
+
+- Fix a bug in which the AO_LOCK header key is assumed to exist.  The AO_LOCK header key is optional. (`#249 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/249>`__)
+
+
+v10.7.1 (2025-04-17)
+====================
+
+Bugfixes
+--------
+
+- Fix a bug exposed by updates in the `dkist-inventory` package that did not manage HISTORY or COMMENT cards correctly. (`#248 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/248>`__)
+
+
 v10.7.0 (2025-04-14)
 ====================
 

{dkist_processing_common-10.7.1rc1 → dkist_processing_common-10.8.0rc1}/PKG-INFO

@@ -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.8.0rc1/changelog/222.bugfix.rst

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

dkist_processing_common-10.8.0rc1/changelog/222.feature.2.rst

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

dkist_processing_common-10.8.0rc1/changelog/222.feature.rst

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

{dkist_processing_common-10.7.1rc1 → dkist_processing_common-10.8.0rc1}/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-10.7.1rc1 → dkist_processing_common-10.8.0rc1}/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-10.7.1rc1 → dkist_processing_common-10.8.0rc1}/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 → dkist_processing_common-10.8.0rc1}/dkist_processing_common.egg-info/PKG-INFO

@@ -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 → dkist_processing_common-10.8.0rc1}/dkist_processing_common.egg-info/SOURCES.txt

@@ -7,7 +7,9 @@ README.rst
 bitbucket-pipelines.yml
 pyproject.toml
 changelog/.gitempty
-changelog/248.bugfix.rst
+changelog/222.bugfix.rst
+changelog/222.feature.2.rst
+changelog/222.feature.rst
 dkist_processing_common/__init__.py
 dkist_processing_common/config.py
 dkist_processing_common/manual.py

{dkist_processing_common-10.7.1rc1 → dkist_processing_common-10.8.0rc1}/dkist_processing_common.egg-info/requires.txt

@@ -1,5 +1,5 @@
 asdf<4.0.0,>=3.5.0
-astropy<7.0.0,>=6.0.0
+astropy>=7.0.0
 dkist-fits-specifications<5.0,>=4.0.0
 dkist-header-validator<6.0,>=5.0.0
 dkist-processing-core==5.1.0
@@ -11,7 +11,7 @@ gqlclient[pydantic]==1.2.3
 sqids==0.5.1
 matplotlib>=3.4
 moviepy>=2.0.0
-numpy>=1.20.2
+numpy>=2.2.5
 object-clerk==0.1.1
 pandas>=1.4.2
 pillow>=10.2.0
@@ -47,7 +47,7 @@ pytest-cov
 pytest-mock
 hypothesis
 towncrier
-dkist-data-simulator>=5.0.0
+dkist-data-simulator>=5.2.6
 dkist-processing-common[inventory]
 dkist-processing-common[asdf]
 dkist-processing-common[quality]

{dkist_processing_common-10.7.1rc1 → dkist_processing_common-10.8.0rc1}/pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
 ]
 dependencies = [
   "asdf >= 3.5.0, <4.0.0",
-  "astropy  >= 6.0.0, < 7.0.0",
+  "astropy  >= 7.0.0",
   "dkist-fits-specifications >= 4.0.0, <5.0",
   "dkist-header-validator >= 5.0.0, <6.0",
   "dkist-processing-core == 5.1.0",
@@ -34,7 +34,7 @@ dependencies = [
   "sqids == 0.5.1",
   "matplotlib >= 3.4",
   "moviepy >= 2.0.0",
-  "numpy >= 1.20.2",
+  "numpy >= 2.2.5",
   "object-clerk == 0.1.1",
   "pandas >= 1.4.2",
   "pillow >= 10.2.0",
@@ -60,7 +60,7 @@ test = [
   "pytest-mock",
   "hypothesis",
   "towncrier",
-  "dkist-data-simulator >= 5.0.0",
+  "dkist-data-simulator >= 5.2.6",
   "dkist-processing-common[inventory]",
   "dkist-processing-common[asdf]",
   "dkist-processing-common[quality]",

dkist_processing_common-10.7.1rc1/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.