dkist-processing-common 10.7.1rc1__py3-none-any.whl → 10.7.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -512,6 +512,6 @@ class WriteL1Frame(WorkflowTaskBase, MetadataStoreMixin, ABC):
512
512
  @staticmethod
513
513
  def remove_invalid_r0_values(header: fits.Header) -> fits.Header:
514
514
  """Remove the Fried parameter r0 from the header if the AO is not locked."""
515
- if not header["AO_LOCK"]:
515
+ if header.get("AO_LOCK") is not True:
516
516
  header.pop("ATMOS_R0", None)
517
517
  return header
@@ -157,8 +157,9 @@ def write_l1_task(request, recipe_run_id, tmp_path):
157
157
  @pytest.fixture(
158
158
  scope="function",
159
159
  params=[
160
- pytest.param(True, id="AO_lock_on"),
161
- pytest.param(False, id="AO_lock_off"),
160
+ pytest.param({"AO_LOCK": True}, id="AO_LOCK_True"),
161
+ pytest.param({"AO_LOCK": False}, id="AO_LOCK_False"),
162
+ pytest.param({}, id="AO_LOCK_missing"),
162
163
  ],
163
164
  )
164
165
  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
171
172
  ):
172
173
  task.scratch = WorkflowFileSystem(recipe_run_id=recipe_run_id, scratch_base_path=tmp_path)
173
174
  header = complete_common_header
174
- header["AO_LOCK"] = request.param
175
+ header.pop("AO_LOCK", None) # If it's not required, shouldn't be here in the first place??
176
+ header.update(request.param)
175
177
  fried_parameter = 0.2
176
178
  header["ATMOS_R0"] = fried_parameter
177
179
  hdu = fits.PrimaryHDU(data=np.random.random(size=(1, 1, 1)) * 1, header=header)
@@ -604,12 +606,11 @@ def test_check_r0_ao_lock(write_l1_task_no_data):
604
606
  """
605
607
  task, header, r0 = write_l1_task_no_data
606
608
  header_after_check = task.remove_invalid_r0_values(header=header)
607
- if header["AO_LOCK"]:
609
+ if header.get("AO_LOCK"):
608
610
  assert header_after_check["ATMOS_R0"] == header["ATMOS_R0"]
609
611
  assert header["ATMOS_R0"] == r0
610
612
  assert header["AO_LOCK"]
611
- if not header["AO_LOCK"]:
612
- with pytest.raises(KeyError) as ke:
613
+ else:
614
+ with pytest.raises(KeyError, match="Keyword 'ATMOS_R0' not found"):
613
615
  invalid_r0 = header_after_check["ATMOS_R0"]
614
- assert "Keyword 'ATMOS_R0' not found" in str(ke)
615
- assert not header["AO_LOCK"]
616
+ assert header.get("AO_LOCK") != True
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dkist-processing-common
3
- Version: 10.7.1rc1
3
+ Version: 10.7.2
4
4
  Summary: Common task classes used by the DKIST science data processing pipelines
5
5
  Author-email: NSO / AURA <dkistdc@nso.edu>
6
6
  License: BSD-3-Clause
@@ -1,5 +1,4 @@
1
1
  changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
2
- changelog/248.bugfix.rst,sha256=zpa1QJfaqZ5dbakRBvlGQsp_B2i66oBFez2jAFFHZwM,118
3
2
  dkist_processing_common/__init__.py,sha256=490Fwm_GgqpwriQlsYfKcLUZNhZ6GkINtJqcYSIEKoU,319
4
3
  dkist_processing_common/config.py,sha256=IcpaD_NvHZU-aLlUNOTdRC4V7ADIvVQwrZ2dHhIr4NY,4247
5
4
  dkist_processing_common/manual.py,sha256=IH72QxdGlr-BuWq2EDrfC9yStegO-elUWrobQqT4710,7042
@@ -59,7 +58,7 @@ dkist_processing_common/tasks/teardown.py,sha256=e4LKnphJDYDVDAez2tH7MxpZgCmxYsK
59
58
  dkist_processing_common/tasks/transfer_input_data.py,sha256=afEW0glpCFMZRj90nFtQo_4XOQ4CuoOh86jahP6a-a0,5548
60
59
  dkist_processing_common/tasks/trial_catalog.py,sha256=Y3DKstRfMS8nWWtJFMB0MUVPlZ1jWS_2jhJGMWwxy50,8748
61
60
  dkist_processing_common/tasks/trial_output_data.py,sha256=aI_aRuu0qVO8zFGrr_9baxx9i3jUEHZSmsmbO6ytlkE,6960
62
- dkist_processing_common/tasks/write_l1.py,sha256=Jw8zQjlYjBQru3m1SB_ZDmicMkDRiUihy9VdwehvZc0,22683
61
+ dkist_processing_common/tasks/write_l1.py,sha256=8KQ5LWa15mmjcoN0EgyaeLJS2qxeAowU5MC8IEIt4l4,22695
63
62
  dkist_processing_common/tasks/mixin/__init__.py,sha256=-g-DQbU7m1bclJYuFe3Yh757V-35GIDTbstardKQ7nU,68
64
63
  dkist_processing_common/tasks/mixin/globus.py,sha256=QAV8VElxMAqxJ2KSB_bJaraceovYfjHXjOdocrTCkIA,6592
65
64
  dkist_processing_common/tasks/mixin/input_dataset.py,sha256=dkW5vf_QPgWedHO_Lf9GjBxr1QrUCKs6gIXufUTi7GE,6813
@@ -101,7 +100,7 @@ dkist_processing_common/tests/test_transfer_l1_output_data.py,sha256=27PifkyH3RZ
101
100
  dkist_processing_common/tests/test_trial_catalog.py,sha256=SZ-nyn0MXU9Lkg_94FbKER_cwiGoi06GYlzF_3AmvKg,6802
102
101
  dkist_processing_common/tests/test_trial_output_data.py,sha256=cBCj0kXyF5NEMzKh6zPVksdoXyE8ju1opJgWgjdcJWA,12790
103
102
  dkist_processing_common/tests/test_workflow_task_base.py,sha256=Z5aPW5LQtS0UWJiYho4X0r-2gPLfzpkmMwfmaoFLjMg,10517
104
- dkist_processing_common/tests/test_write_l1.py,sha256=R_ljJdSC4hCHS_mLV6rKE7PVfpDWCaMXoN6n45QJNWM,21951
103
+ dkist_processing_common/tests/test_write_l1.py,sha256=S27RCI5-hIcn3nso10mZU4yRleFwQie1kZqcuEq34ys,22091
105
104
  docs/Makefile,sha256=qnlVz6PuBqE39NfHWuUnHhNEA-EFgT2-WJNNNy9ttfk,4598
106
105
  docs/changelog.rst,sha256=S2jPASsWlQxSlAPqdvNrYvhk9k3FcFWNXFNDYXBSjl4,120
107
106
  docs/conf.py,sha256=FkX575cqTqZGCcLAjg2MlvE8Buj1Vt3CpHNgZxG256E,1890
@@ -110,7 +109,7 @@ docs/landing_page.rst,sha256=aPAuXFhBx73lEZ59B6E6JXxkK0LlxzD0n-HXqHrfumQ,746
110
109
  docs/make.bat,sha256=mBAhtURwhQ7yc95pqwJzlhqBSvRknr1aqZ5s8NKvdKs,4513
111
110
  docs/requirements.txt,sha256=Kbl_X4c7RQZw035YTeNB63We6I7pvXFU4T0Uflp2yDY,29
112
111
  licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
113
- dkist_processing_common-10.7.1rc1.dist-info/METADATA,sha256=Q9cp_Hd28cRGUf8P_YPPpp67BNRg7uN61WmqbLg3_Bg,7157
114
- dkist_processing_common-10.7.1rc1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
115
- dkist_processing_common-10.7.1rc1.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
116
- dkist_processing_common-10.7.1rc1.dist-info/RECORD,,
112
+ dkist_processing_common-10.7.2.dist-info/METADATA,sha256=Mb24w78N3CuFv4nFpPs9pPDtGAsUudwJwRSpVlgE-S0,7154
113
+ dkist_processing_common-10.7.2.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
114
+ dkist_processing_common-10.7.2.dist-info/top_level.txt,sha256=LJhd1W-Vn90K8HnQDIE4r52YDpUjjMWDnllAWHBByW0,48
115
+ dkist_processing_common-10.7.2.dist-info/RECORD,,
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (78.1.0)
2
+ Generator: setuptools (79.0.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5
 
changelog/248.bugfix.rst DELETED
@@ -1 +0,0 @@
1
- Fix a bug exposed by updates in the `dkist-inventory` package that did not manage HISTORY or COMMENT cards correctly.