Merged in bugfix/sync-stg-into-dev-20260518 (pull request #1015)

Merged in dev (pull request #1001)

* Merged in dev (pull request #1001)

Dev

* Revert premature merge of bugfix/retire_stale_client_file_processing

PR #959 was merged into dev without approval. This reverts commits
5e143c10, 63f32c41, 849aa626, and 927abcae to restore dev to its
pre-merge state. The changes will be re-submitted via a new PR
after proper review.

* Merged in bugfix/retire_stale_client_file_processing (pull request #961)

Return None for dashboard output when dashboard postprocessing is off

* Return None for dashboard output when dashboard postprocessing is off

FINAL_RESULT_DF_DASHBOARD was initialized as an empty DataFrame even
when RUN_DASHBOARD_POSTPROCESSING was False, causing downstream code
to needlessly process it (reorder_columns, etc). Now returns None
when dashboard is not requested, matching the postprocess() contract.

* Merged dev into bugfix/retire_stale_client_file_processing

* Merge dev (with revert) into feature branch

* Re-apply retire stale client file_processing changes

Revert of the revert (4f53b528) to…
* Back-merge stg into dev to clear PR #1014 conflicts

Stg's only delta from dev is commit 8d10f44d (the squash-merge of PR #1001),
which is an older snapshot of dev. Current dev already contains all of that
content plus PR #1012 (the 9 stg fixes preservation) and every subsequent
PR. Using -s ours records stg's tip as a second parent without changing dev's
tree; after this merge lands in dev, stg becomes an ancestor of dev and
PR #1014 (dev -> stg) can fast-forward.


Approved-by: Siddhant Medar
This commit is contained in:
Praneel Panchigar
2026-05-19 16:26:59 +00:00
parent 53a0c76d8e
commit 4d153aa090

Diff Content Not Available