dkist-processing-common 13.0.3rc3__tar.gz → 13.0.4__tar.gz

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/.readthedocs.yml

@@ -1,6 +1,6 @@
 version: 2
 build:
-  os: ubuntu-20.04
+  os: ubuntu-24.04
   tools:
     python: "3.13"
   apt_packages:

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/CHANGELOG.rst

@@ -1,3 +1,33 @@
+v13.0.4 (2026-04-16)
+====================
+
+Misc
+----
+
+- Convert fits.open usage in tests to context managers. (`#289 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/289>`__)
+- Remove deprecated Astropy usage (e.g., CompImageHeader) and updated tests accordingly. (`#289 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/289>`__)
+- Configure pyproject.toml to turn warnings raised during testing into errors.
+  Ignore certain testing warnings that we know are okay. (`#289 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/289>`__)
+- Modernize code to address Python 3.13 deprecations (e.g., datetime.utcnow, Pillow image mode handling). (`#289 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/289>`__)
+- Update dkist-processing-core to v7.2.1, which includes better warning handling and an RTD build OS update. (`#298 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/298>`__)
+- Upgrade Read the Docs LTS build image to Ubuntu 24.04. (`#328 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/328>`__)
+
+
+v13.0.3 (2026-04-14)
+====================
+
+Features
+--------
+
+- Simplify the production of L1 quality metrics. (`#326 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/326>`__)
+
+
+Misc
+----
+
+- Make isb username and password configurable for local unit tests. (`#322 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/322>`__)
+
+
 v13.0.1 (2026-04-07)
 ====================
 

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 13.0.3rc3
+Version: 13.0.4
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,7 +17,7 @@ Requires-Dist: asdf<4.0.0,>=3.5.0
 Requires-Dist: astropy>=7.0.0
 Requires-Dist: dkist-fits-specifications<5.0,>=4.24.0
 Requires-Dist: dkist-header-validator<6.0,>=5.3.0
-Requires-Dist: dkist-processing-core==7.1.0
+Requires-Dist: dkist-processing-core==7.2.1
 Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<5.0,>=4.3.0
 Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common/tasks/assemble_movie.py

@@ -225,7 +225,7 @@ class AssembleMovie(WorkflowTaskBase, ABC):
             )
 
         background = Image.new("RGB", self.MOVIE_FRAME_SHAPE, (0, 0, 0))
-        frame_im = Image.fromarray(colored_image, mode="RGB")
+        frame_im = Image.fromarray(colored_image)
         frame_im = frame_im.resize(self.MOVIE_FRAME_SHAPE, resample=Image.NEAREST)
         background.paste(frame_im)
         draw = ImageDraw.Draw(background)

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common/tasks/trial_catalog.py

@@ -93,7 +93,7 @@ class CreateTrialDatasetInventory(OutputDataBase):
             frame_inventory["_id"] = uuid4().hex
             frame_inventory["bucket"] = self.destination_bucket
             frame_inventory["frameStatus"] = "AVAILABLE"
-            frame_inventory["createDate"] = datetime.utcnow().isoformat("T")
+            frame_inventory["createDate"] = datetime.now().isoformat("T")
             frame_inventory["updateDate"] = None
             frame_inventory["lostDate"] = None
             frame_inventory["headerHDU"] = 1

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common/tests/conftest.py

@@ -617,7 +617,7 @@ def visp_modulation_matrix() -> np.ndarray:
 
 @pytest.fixture(scope="session")
 def fully_realistic_local_cs(
-    cs_with_correct_geometry, visp_modulation_matrix, pac_fit_mode, pac_init_set
+    cs_with_correct_geometry, visp_modulation_matrix, pac_fit_mode, pac_init_set, cs_data_shape
 ):
 
     cs_dict = cs_with_correct_geometry
@@ -643,7 +643,7 @@ def fully_realistic_local_cs(
     # Now set the "observed" value for each of the input objects
     for m in range(dresser.nummod):
         for n in range(dresser.numsteps):
-            cs_dict[n][m].data *= observed[m, n] / np.mean(cs_dict[n][m].data)
+            cs_dict[n][m].data = np.ones(cs_data_shape) * observed[m, n]
 
     return cs_dict
 

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common/tests/test_codecs.py

@@ -454,11 +454,10 @@ def test_fits_array_encoder_header_preserved(ndarray_object, header_func: Callab
     header = header_func(raw_header)
     encoded_data = fits_array_encoder(data=ndarray_object, header=header)
     bytes_reader = BytesIO(encoded_data)
-    hdul = fits.open(bytes_reader)
-
-    assert len(hdul) == 1
-    np.testing.assert_equal(hdul[0].data, ndarray_object)
-    assert hdul[0].header["KEY1"] == "VALUE1"
+    with fits.open(bytes_reader) as hdul:
+        assert len(hdul) == 1
+        np.testing.assert_equal(hdul[0].data, ndarray_object)
+        assert hdul[0].header["KEY1"] == "VALUE1"
 
 
 @pytest.mark.parametrize(
@@ -584,13 +583,11 @@ def test_fits_header_decoder(path_fixture_name, request):
     if init_num_fd is not None:
         assert init_num_fd == post_num_fd
 
-    hdul = fits.open(file_path, disable_image_compression=True)
-    if "compressed" in path_fixture_name:
-        expected_header = hdul[1].header
-    else:
-        expected_header = hdul[0].header
+    with fits.open(file_path, disable_image_compression=True) as hdul:
+        index = 1 if "compressed" in path_fixture_name else 0
+        expected_header = hdul[index].header
 
-    assert header == expected_header
+        assert header == expected_header
 
 
 @pytest.mark.parametrize(

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common/tests/test_fits_access.py

@@ -342,7 +342,6 @@ def test_header_dict(hdu_with_special_keys):
     [
         pytest.param(dict, id="Dict"),
         pytest.param(fits.header.Header, id="Header"),
-        pytest.param(fits.hdu.compressed.CompImageHeader, id="CompHeader"),
     ],
 )
 def test_from_header_naxis_preserved(header_type):

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common/tests/test_quality_mixin.py

@@ -1074,8 +1074,8 @@ def test_validate_vertical_multi_pane_plot_model():
     # Test invalid case
     with pytest.raises(
         ValidationError,
-        match="The number of items in `top_to_bottom_height_ratios` list \(3\) is not "
-        "the same as the number of plots \(2\)",
+        match=r"The number of items in `top_to_bottom_height_ratios` list \(3\) is not "
+        r"the same as the number of plots \(2\)",
     ):
         _ = VerticalMultiPanePlot2D(
             top_to_bottom_plot_list=[plot2d, plot2d], top_to_bottom_height_ratios=[1.0, 2.0, 3.0]

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common/tests/test_write_l1.py

@@ -445,17 +445,18 @@ def test_solarnet_keys(write_l1_task, mocker, fake_gql_client):
     task()
     files = list(task.read(tags=[Tag.frame(), Tag.output()]))
     for file in files:
-        header = fits.open(file)[1].header
-        assert header["DATEREF"] == header["DATE-BEG"]
-        assert round(header["OBSGEO-X"]) == -5466045
-        assert round(header["OBSGEO-Y"]) == -2404389
-        assert round(header["OBSGEO-Z"]) == 2242134
-        assert header["SOLARRAD"] == 975.58
-        assert header["SPECSYS"] == "TOPOCENT"
-        assert header["VELOSYS"] == 0.0
-        assert header["WAVEBAND"] == "Fe XIII (1079.8 nm)"
-        assert header["WAVEMIN"] == 1075.0
-        assert header["WAVEMAX"] == 1085.0
+        with fits.open(file) as hdu:
+            header = hdu[1].header
+            assert header["DATEREF"] == header["DATE-BEG"]
+            assert round(header["OBSGEO-X"]) == -5466045
+            assert round(header["OBSGEO-Y"]) == -2404389
+            assert round(header["OBSGEO-Z"]) == 2242134
+            assert header["SOLARRAD"] == 975.58
+            assert header["SPECSYS"] == "TOPOCENT"
+            assert header["VELOSYS"] == 0.0
+            assert header["WAVEBAND"] == "Fe XIII (1079.8 nm)"
+            assert header["WAVEMIN"] == 1075.0
+            assert header["WAVEMAX"] == 1085.0
 
 
 def test_documentation_keys(write_l1_task, mocker, fake_gql_client):
@@ -477,18 +478,20 @@ def test_documentation_keys(write_l1_task, mocker, fake_gql_client):
     task()
     files = list(task.read(tags=[Tag.frame(), Tag.output()]))
     for file in files:
-        header = fits.open(file)[1].header
-        assert header["INFO_URL"] == task.docs_base_url
-        assert header["HEADVERS"] == spec_version
-        assert (
-            header["HEAD_URL"] == f"{task.docs_base_url}/projects/data-products/en/v{spec_version}"
-        )
-        calvers = task.version_from_module_name()
-        assert header["CALVERS"] == calvers
-        assert (
-            header["CAL_URL"]
-            == f"{task.docs_base_url}/projects/{task.constants.instrument.lower()}/en/v{calvers}/{task.workflow_name}.html"
-        )
+        with fits.open(file) as hdu:
+            header = hdu[1].header
+            assert header["INFO_URL"] == task.docs_base_url
+            assert header["HEADVERS"] == spec_version
+            assert (
+                header["HEAD_URL"]
+                == f"{task.docs_base_url}/projects/data-products/en/v{spec_version}"
+            )
+            calvers = task.version_from_module_name()
+            assert header["CALVERS"] == calvers
+            assert (
+                header["CAL_URL"]
+                == f"{task.docs_base_url}/projects/{task.constants.instrument.lower()}/en/v{calvers}/{task.workflow_name}.html"
+            )
 
 
 def test_get_version_from_module(write_l1_task):
@@ -519,13 +522,13 @@ def test_rice_compression_with_specified_tile_size(write_l1_task, mocker, fake_g
     task()
     files = list(task.read(tags=[Tag.frame(), Tag.output()]))
     for file in files:
-        hdul = fits.open(file)
-        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):
-            assert comp_header["ZTILE" + str(i + 1)] == min(dim, TILE_SIZE)
+        with fits.open(file) as hdul:
+            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):
+                assert comp_header["ZTILE" + str(i + 1)] == min(dim, TILE_SIZE)
 
 
 def test_rice_compression_with_default_tile_size(
@@ -547,14 +550,14 @@ def test_rice_compression_with_default_tile_size(
     assert task.tile_size_param == None
     files = list(task.read(tags=[Tag.frame(), Tag.output()]))
     for file in files:
-        hdul = fits.open(file)
-        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]
-        assert comp_header["ZTILE2"] == 128
-        assert comp_header["ZTILE3"] == 1
+        with fits.open(file) as hdul:
+            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]
+            assert comp_header["ZTILE2"] == 128
+            assert comp_header["ZTILE3"] == 1
 
 
 def test_reprocessing_keys(write_l1_task, mocker, fake_gql_client):
@@ -571,20 +574,26 @@ def test_reprocessing_keys(write_l1_task, mocker, fake_gql_client):
     task()
     files = list(task.read(tags=[Tag.frame(), Tag.output()]))
     for file in files:
-        header = fits.open(file)[1].header
-        assert header["IDSPARID"] == task.metadata_store_input_dataset_parameters.inputDatasetPartId
-        assert (
-            header["IDSOBSID"]
-            == task.metadata_store_input_dataset_observe_frames.inputDatasetPartId
-        )
-        assert (
-            header["IDSCALID"]
-            == task.metadata_store_input_dataset_calibration_frames.inputDatasetPartId
-        )
-        assert header["WKFLNAME"] == task.workflow_name
-        assert header["WKFLVERS"] == task.workflow_version
-        assert header["PROCTYPE"] == "L1"
-        assert header["PRODUCT"] == task.compute_product_id(header["IDSOBSID"], header["PROCTYPE"])
+        with fits.open(file) as hdu:
+            header = hdu[1].header
+            assert (
+                header["IDSPARID"]
+                == task.metadata_store_input_dataset_parameters.inputDatasetPartId
+            )
+            assert (
+                header["IDSOBSID"]
+                == task.metadata_store_input_dataset_observe_frames.inputDatasetPartId
+            )
+            assert (
+                header["IDSCALID"]
+                == task.metadata_store_input_dataset_calibration_frames.inputDatasetPartId
+            )
+            assert header["WKFLNAME"] == task.workflow_name
+            assert header["WKFLVERS"] == task.workflow_version
+            assert header["PROCTYPE"] == "L1"
+            assert header["PRODUCT"] == task.compute_product_id(
+                header["IDSOBSID"], header["PROCTYPE"]
+            )
 
 
 def test_missing_input_dataset_part(
@@ -603,13 +612,17 @@ def test_missing_input_dataset_part(
     task()
     files = list(task.read(tags=[Tag.frame(), Tag.output()]))
     for file in files:
-        header = fits.open(file)[1].header
-        assert header["IDSPARID"] == task.metadata_store_input_dataset_parameters.inputDatasetPartId
-        assert (
-            header["IDSOBSID"]
-            == task.metadata_store_input_dataset_observe_frames.inputDatasetPartId
-        )
-        assert "IDSCALID" not in header
+        with fits.open(file) as hdu:
+            header = hdu[1].header
+            assert (
+                header["IDSPARID"]
+                == task.metadata_store_input_dataset_parameters.inputDatasetPartId
+            )
+            assert (
+                header["IDSOBSID"]
+                == task.metadata_store_input_dataset_observe_frames.inputDatasetPartId
+            )
+            assert "IDSCALID" not in header
 
 
 @pytest.mark.parametrize(
@@ -757,8 +770,9 @@ def test_empty_waveband(write_l1_task_with_empty_waveband, mocker, fake_gql_clie
     task()
     files = list(task.read(tags=[Tag.frame(), Tag.output()]))
     for file in files:
-        header = fits.open(file)[1].header
-        assert header["WAVEMIN"] == 10000
-        assert header["WAVEMAX"] == 10050
-        with pytest.raises(KeyError):
-            header["WAVEBAND"]
+        with fits.open(file) as hdu:
+            header = hdu[1].header
+            assert header["WAVEMIN"] == 10000
+            assert header["WAVEMAX"] == 10050
+            with pytest.raises(KeyError):
+                header["WAVEBAND"]

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 13.0.3rc3
+Version: 13.0.4
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,7 +17,7 @@ Requires-Dist: asdf<4.0.0,>=3.5.0
 Requires-Dist: astropy>=7.0.0
 Requires-Dist: dkist-fits-specifications<5.0,>=4.24.0
 Requires-Dist: dkist-header-validator<6.0,>=5.3.0
-Requires-Dist: dkist-processing-core==7.1.0
+Requires-Dist: dkist-processing-core==7.2.1
 Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<5.0,>=4.3.0
 Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common.egg-info/SOURCES.txt

@@ -7,8 +7,6 @@ README.rst
 bitbucket-pipelines.yml
 pyproject.toml
 changelog/.gitempty
-changelog/322.misc.rst
-changelog/326.feature.rst
 dkist_processing_common/__init__.py
 dkist_processing_common/config.py
 dkist_processing_common/manual.py

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/dkist_processing_common.egg-info/requires.txt

@@ -2,7 +2,7 @@ asdf<4.0.0,>=3.5.0
 astropy>=7.0.0
 dkist-fits-specifications<5.0,>=4.24.0
 dkist-header-validator<6.0,>=5.3.0
-dkist-processing-core==7.1.0
+dkist-processing-core==7.2.1
 dkist-processing-pac<4.0,>=3.1
 dkist-service-configuration<5.0,>=4.3.0
 dkist-spectral-lines<4.0,>=3.0.0

{dkist_processing_common-13.0.3rc3 → dkist_processing_common-13.0.4}/pyproject.toml

@@ -25,7 +25,7 @@ dependencies = [
   "astropy  >= 7.0.0",
   "dkist-fits-specifications >= 4.24.0, <5.0",
   "dkist-header-validator >= 5.3.0, <6.0",
-  "dkist-processing-core == 7.1.0",
+  "dkist-processing-core == 7.2.1",
   "dkist-processing-pac >= 3.1, <4.0",
   "dkist-service-configuration >= 4.3.0, <5.0",
   "dkist-spectral-lines >= 3.0.0, <4.0",
@@ -89,6 +89,16 @@ markers = [
   "development: For tests that can only be run while developing with a sidecar proxy (as opposed to in bitbucket pipelines)",
   "flaky: For tests that sporadically fail",
 ]
+filterwarnings = [
+    # Turn all warnings into errors so they do not pass silently.
+    "error",
+    # Ignore pytest's funnybusiness
+    "ignore::pytest.PytestUnraisableExceptionWarning",
+    # A few cards are too long (> 80 char) only in testing, not in production. Ignore it here
+    "ignore:Card is too long, comment will be truncated:astropy.io.fits.verify.VerifyWarning",
+    # We don't care about this 'invalid value' during testing
+    "ignore:invalid value encountered in scalar divide:RuntimeWarning"
+]
 
 [tool.coverage.run]
 omit = [

dkist_processing_common-13.0.3rc3/changelog/322.misc.rst

@@ -1 +0,0 @@
-Make isb username and password configurable for local unit tests.

dkist_processing_common-13.0.3rc3/changelog/326.feature.rst

@@ -1 +0,0 @@
-Simplify the production of L1 quality metrics.