lsst-ctrl-mpexec 29.2025.4300__tar.gz → 29.2025.4500__tar.gz

{lsst_ctrl_mpexec-29.2025.4300/python/lsst_ctrl_mpexec.egg-info → lsst_ctrl_mpexec-29.2025.4500}/PKG-INFO

@@ -1,18 +1,18 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-mpexec
-Version: 29.2025.4300
+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: BSD 3-Clause License
+License-Expression: BSD-3-Clause OR GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/lsst/ctrl_mpexec
 Keywords: lsst
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Requires-Python: >=3.11.0
 Description-Content-Type: text/x-rst

{lsst_ctrl_mpexec-29.2025.4300 → lsst_ctrl_mpexec-29.2025.4500}/pyproject.toml

@@ -6,19 +6,20 @@ build-backend = "setuptools.build_meta"
 name = "lsst-ctrl-mpexec"
 requires-python = ">=3.11.0"
 description = "Pipeline execution infrastructure for the Rubin Observatory LSST Science Pipelines."
-license = {text = "BSD 3-Clause License"}
+license = "BSD-3-Clause OR GPL-3.0-or-later"
+license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"]
 readme = "README.rst"
 authors = [
     {name="Rubin Observatory Data Management", email="dm-admin@lists.lsst.org"},
 ]
 classifiers = [
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Scientific/Engineering :: Astronomy",
 ]
 keywords = ["lsst"]
@@ -47,7 +48,6 @@ where = ["python"]
 
 [tool.setuptools]
 zip-safe = true
-license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"]
 
 [tool.setuptools.package-data]
 "lsst.ctrl.mpexec" = ["py.typed"]
@@ -109,7 +109,6 @@ known_first_party = ["lsst"]
 write_to = "python/lsst/ctrl/mpexec/version.py"
 
 [tool.pytest.ini_options]
-open_files_ignore = ["*.ttf", "gen3.sqlite3"]
 
 [tool.pydocstyle]
 convention = "numpy"

{lsst_ctrl_mpexec-29.2025.4300 → lsst_ctrl_mpexec-29.2025.4500}/python/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-29.2025.4300 → lsst_ctrl_mpexec-29.2025.4500}/python/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-29.2025.4300 → lsst_ctrl_mpexec-29.2025.4500}/python/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-29.2025.4300 → lsst_ctrl_mpexec-29.2025.4500}/python/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-29.2025.4500/python/lsst/ctrl/mpexec/version.py

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

{lsst_ctrl_mpexec-29.2025.4300 → lsst_ctrl_mpexec-29.2025.4500/python/lsst_ctrl_mpexec.egg-info}/PKG-INFO

@@ -1,18 +1,18 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-mpexec
-Version: 29.2025.4300
+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: BSD 3-Clause License
+License-Expression: BSD-3-Clause OR GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/lsst/ctrl_mpexec
 Keywords: lsst
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Requires-Python: >=3.11.0
 Description-Content-Type: text/x-rst

lsst_ctrl_mpexec-29.2025.4300/python/lsst/ctrl/mpexec/version.py

@@ -1,2 +0,0 @@
-__all__ = ["__version__"]
-__version__ = "29.2025.4300"