lsst-ctrl-mpexec 29.2025.4400__py3-none-any.whl → 29.2025.4500__py3-none-any.whl

lsst/ctrl/mpexec/cli/butler_factory.py

@@ -583,7 +583,7 @@ class ButlerFactory:
                     # collection from its chain collection first.
                     with butler.transaction():
                         butler.collections.redefine_chain(self.output.name, chain_definition)
-                        butler.removeRuns([replaced], unstore=True)
+                        butler.removeRuns([replaced])
                 elif prune_replaced is not None:
                     raise NotImplementedError(f"Unsupported --prune-replaced option '{prune_replaced}'.")
             if not self.output.exists:

lsst/ctrl/mpexec/cli/cmd/commands.py

@@ -141,7 +141,7 @@ concurrency = multiprocessing
 @click.command(cls=PipetaskCommand, epilog=epilog)
 @click.pass_context
 @ctrlMpExecOpts.show_option()
-@ctrlMpExecOpts.pipeline_build_options()
+@ctrlMpExecOpts.pipeline_build_options(skip_butler_config=True)
 @ctrlMpExecOpts.qgraph_options()
 @ctrlMpExecOpts.butler_options()
 @option_section(sectionText="")

lsst/ctrl/mpexec/cli/opt/optionGroups.py

@@ -54,9 +54,15 @@ instrumentOptionHelp = (
 class pipeline_build_options(OptionGroup):  # noqa: N801
     """Decorator to add options to the command function for building a
     pipeline.
+
+    Parameters
+    ----------
+    skip_butler_config : `bool`, optional
+        If `True` the butler configuration option will not be included and will
+        be assumed to be added explicitly elsewhere.
     """
 
-    def __init__(self) -> None:
+    def __init__(self, skip_butler_config: bool = False) -> None:
         self.decorators = [
             option_section(sectionText="Pipeline build options:"),
             ctrlMpExecOpts.pipeline_option(),
@@ -76,8 +82,9 @@ class pipeline_build_options(OptionGroup):  # noqa: N801
             ctrlMpExecOpts.pipeline_dot_option(),
             ctrlMpExecOpts.pipeline_mermaid_option(),
             pipeBaseOpts.instrument_option(help=instrumentOptionHelp, metavar="instrument", multiple=True),
-            ctrlMpExecOpts.butler_config_option(required=False),
         ]
+        if not skip_butler_config:
+            self.decorators.append(ctrlMpExecOpts.butler_config_option(required=False))
 
 
 class coverage_options(OptionGroup):  # noqa: N801
@@ -95,9 +102,23 @@ class coverage_options(OptionGroup):  # noqa: N801
 class qgraph_options(OptionGroup):  # noqa: N801
     """Decorator to add options to a command function for creating a quantum
     graph.
+
+    Parameters
+    ----------
+    skip_coverage : `bool`, optional
+        If `True` the coverage configuration options will not be included and
+        will be assumed to be added explicitly elsewhere.
+    skip_clobber : `bool`, optional
+        If `True` the clobber configuration option will not be included and
+        will be assumed to be added explicitly elsewhere.
+    skip_summary : `bool`, optional
+        If `True` the summary configuration option will not be included and
+        will be assumed to be added explicitly elsewhere.
     """
 
-    def __init__(self) -> None:
+    def __init__(
+        self, skip_coverage: bool = False, skip_clobber: bool = False, skip_summary: bool = False
+    ) -> None:
         self.decorators = [
             option_section(sectionText="Quantum graph building options:"),
             ctrlMpExecOpts.qgraph_option(),
@@ -106,18 +127,21 @@ class qgraph_options(OptionGroup):  # noqa: N801
             ctrlMpExecOpts.qgraph_datastore_records_option(),
             ctrlMpExecOpts.skip_existing_in_option(),
             ctrlMpExecOpts.skip_existing_option(),
-            ctrlMpExecOpts.clobber_outputs_option(),
             ctrlMpExecOpts.save_qgraph_option(),
             ctrlMpExecOpts.qgraph_dot_option(),
             ctrlMpExecOpts.qgraph_mermaid_option(),
-            ctrlMpExecOpts.summary_option(),
             ctrlMpExecOpts.dataset_query_constraint(),
             ctrlMpExecOpts.data_id_table_option(),
             ctrlMpExecOpts.mock_option(),
             ctrlMpExecOpts.mock_failure_option(),
             ctrlMpExecOpts.unmocked_dataset_types_option(),
-            coverage_options(),
         ]
+        if not skip_clobber:
+            self.decorators.append(ctrlMpExecOpts.clobber_outputs_option())
+        if not skip_summary:
+            self.decorators.append(ctrlMpExecOpts.summary_option())
+        if not skip_coverage:
+            self.decorators.append(coverage_options())
 
 
 class butler_options(OptionGroup):  # noqa: N801
@@ -187,8 +211,8 @@ class run_options(OptionGroup):  # noqa: N801
             click.pass_context,
             ctrlMpExecOpts.debug_option(),
             ctrlMpExecOpts.show_option(),
-            pipeline_build_options(),
-            qgraph_options(),
+            pipeline_build_options(skip_butler_config=True),
+            qgraph_options(skip_coverage=True, skip_clobber=True, skip_summary=True),
             butler_options(),
             execution_options(),
             meta_info_options(),

lsst/ctrl/mpexec/cli/utils.py

@@ -227,7 +227,7 @@ def summarize_quantum_graph(qg: BaseQuantumGraph) -> int:
     Parameters
     ----------
     qg : `lsst.pipe.base.quantum_graph.BaseQuantumGraph`
-        Quantum graph object
+        Quantum graph object.
 
     Returns
     -------

lsst/ctrl/mpexec/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.4400"
+__version__ = "29.2025.4500"

{lsst_ctrl_mpexec-29.2025.4400.dist-info → lsst_ctrl_mpexec-29.2025.4500.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-mpexec
-Version: 29.2025.4400
+Version: 29.2025.4500
 Summary: Pipeline execution infrastructure for the Rubin Observatory LSST Science Pipelines.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License-Expression: BSD-3-Clause OR GPL-3.0-or-later

{lsst_ctrl_mpexec-29.2025.4400.dist-info → lsst_ctrl_mpexec-29.2025.4500.dist-info}/RECORD

@@ -16,16 +16,16 @@ lsst/ctrl/mpexec/simple_pipeline_executor.py,sha256=aVWgOds0ILCTzXdrWy0KFyjcIuqw
 lsst/ctrl/mpexec/singleQuantumExecutor.py,sha256=Y70xs5f06sEeDXF3cKNjxL4gdG69Osu8Xbol-vm-VIo,8616
 lsst/ctrl/mpexec/taskFactory.py,sha256=0TdCM-le7CXhobVbWPTqcq9sOrGceUY6mmkzzWhi0dM,1707
 lsst/ctrl/mpexec/util.py,sha256=y2Rw5PL40_EuLtVxiqSVX0JfPV4IrFl1LfOMUWx2u30,4236
-lsst/ctrl/mpexec/version.py,sha256=c_EQrzHIElqjF0MSUCohtezaryfBlqz_McPyAghglVk,55
+lsst/ctrl/mpexec/version.py,sha256=ec8d6sw9aRuINU5Qs4LjOV9LhqSISytoOfEoRYO2XzU,55
 lsst/ctrl/mpexec/cli/__init__.py,sha256=6dpDHNBzyicVpFi1fsaiYVbYEMeoL57IHKkPaej24gs,1301
-lsst/ctrl/mpexec/cli/butler_factory.py,sha256=-Nlm5nVcWK_JbW8oc5qudu9yuZg5Pknf1LmtkxTkHJs,26713
+lsst/ctrl/mpexec/cli/butler_factory.py,sha256=HkM-fjZrb1QBcYCUPoyql9WFkJc5521v03vX-ML7Kis,26699
 lsst/ctrl/mpexec/cli/pipetask.py,sha256=4HnhX9dCizCihVbpHVJX5WXO9TEli9oL6wA-tPh1_vA,2209
-lsst/ctrl/mpexec/cli/utils.py,sha256=WvpVompkHFbk-EAOVNTWXDd_OfWgp0bvzKKCcX1o5r8,9890
+lsst/ctrl/mpexec/cli/utils.py,sha256=0iUM6LGPgSUv3Zh9N-Hi1VNyef3dEZbsR7GOySBU_q0,9891
 lsst/ctrl/mpexec/cli/cmd/__init__.py,sha256=nRmwwW5d55gAEkyE7NpSK8mxa56HcfEta2r-Y9I07F8,1661
-lsst/ctrl/mpexec/cli/cmd/commands.py,sha256=dO0WMFEwAAGoiNBgkQXu1oW-N89Eah89X2XR84PKQBg,17063
+lsst/ctrl/mpexec/cli/cmd/commands.py,sha256=uCnIaFzHhTAt1Onvhp_evPVWlikB6OBMRU7P8XR_Y8s,17086
 lsst/ctrl/mpexec/cli/opt/__init__.py,sha256=IzUInuJj9igiaNcEqMx0adelgJtQC5_XMYnaiizBn0A,1378
 lsst/ctrl/mpexec/cli/opt/arguments.py,sha256=vjUw0ZN_4HStp-_3ne6AT5S_eH7sly3OVfL07tgrJnY,1572
-lsst/ctrl/mpexec/cli/opt/optionGroups.py,sha256=v_fbB-frVUdXr82VY_mC8KHdUJSJNaU64qBJO4cA3To,7445
+lsst/ctrl/mpexec/cli/opt/optionGroups.py,sha256=9UrFUWlkiBaAO2WDE0rKokAEXK-dm-SmBPyapY6B7t8,8622
 lsst/ctrl/mpexec/cli/opt/options.py,sha256=j5abmIcs5huxeYQoVyqle9OL0chm3H34MFOMj-hzFlI,19475
 lsst/ctrl/mpexec/cli/script/__init__.py,sha256=eCuF4FAI5D3pl05IMJj7TCkZq-hireua2mA5Ui-mKSI,1624
 lsst/ctrl/mpexec/cli/script/build.py,sha256=3_ohOGuope_hCrvBAo1X31nejgTZ73PZv_ew3ykhYIc,6919
@@ -38,13 +38,13 @@ lsst/ctrl/mpexec/cli/script/report.py,sha256=ItJitmYmWIDjj7PxRtP4qXLx-z5FAU6nSfI
 lsst/ctrl/mpexec/cli/script/run.py,sha256=d_oSGl6t9qEPeFPsZxlPQkUsGLNNl5wB1PXGn71Fw-s,14135
 lsst/ctrl/mpexec/cli/script/run_qbb.py,sha256=W1MvzoUBKvHNx17s1dvyGXaC7C5uGvbvDrF9meXbvok,10855
 lsst/ctrl/mpexec/cli/script/update_graph_run.py,sha256=2b0Q0j5yPC4bWxq0tsd4et2VmOnu-dQLQa94340z78Y,2623
-lsst_ctrl_mpexec-29.2025.4400.dist-info/licenses/COPYRIGHT,sha256=pGCjnRAnyt02a6_9PLzXQikpvYmvMmK9fCdOKlRSV6k,369
-lsst_ctrl_mpexec-29.2025.4400.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_ctrl_mpexec-29.2025.4400.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_ctrl_mpexec-29.2025.4400.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_ctrl_mpexec-29.2025.4400.dist-info/METADATA,sha256=-5p-2xT5C443CWMUbPAUkc14dDPRKEZi0T1UfCtIKOo,2325
-lsst_ctrl_mpexec-29.2025.4400.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_ctrl_mpexec-29.2025.4400.dist-info/entry_points.txt,sha256=aYE38yqZU8qvpLUUkXzgmUxDJYYknEqPxgxYkowrL4s,64
-lsst_ctrl_mpexec-29.2025.4400.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_ctrl_mpexec-29.2025.4400.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_ctrl_mpexec-29.2025.4400.dist-info/RECORD,,
+lsst_ctrl_mpexec-29.2025.4500.dist-info/licenses/COPYRIGHT,sha256=pGCjnRAnyt02a6_9PLzXQikpvYmvMmK9fCdOKlRSV6k,369
+lsst_ctrl_mpexec-29.2025.4500.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_ctrl_mpexec-29.2025.4500.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_ctrl_mpexec-29.2025.4500.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_ctrl_mpexec-29.2025.4500.dist-info/METADATA,sha256=6FsLrtyJFiSeSPYibNJRPfd58_mwiyG9FKL9EuZqHss,2325
+lsst_ctrl_mpexec-29.2025.4500.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lsst_ctrl_mpexec-29.2025.4500.dist-info/entry_points.txt,sha256=aYE38yqZU8qvpLUUkXzgmUxDJYYknEqPxgxYkowrL4s,64
+lsst_ctrl_mpexec-29.2025.4500.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_ctrl_mpexec-29.2025.4500.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_ctrl_mpexec-29.2025.4500.dist-info/RECORD,,