lsst-pipe-base 30.0.1rc1__tar.gz → 30.2025.5100__tar.gz

{lsst_pipe_base-30.0.1rc1/python/lsst_pipe_base.egg-info → lsst_pipe_base-30.2025.5100}/PKG-INFO

@@ -1,20 +1,20 @@
 Metadata-Version: 2.4
 Name: lsst-pipe-base
-Version: 30.0.1rc1
+Version: 30.2025.5100
 Summary: Pipeline infrastructure for the Rubin Science Pipelines.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License-Expression: BSD-3-Clause OR GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/lsst/pipe_base
-Project-URL: Source, https://github.com/lsst/pipe_base
 Keywords: lsst
 Classifier: Intended Audience :: Science/Research
 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.12.0
+Requires-Python: >=3.11.0
 Description-Content-Type: text/markdown
 License-File: COPYRIGHT
 License-File: LICENSE

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/doc/lsst.pipe.base/CHANGES.rst

@@ -1,108 +1,3 @@
-lsst-pipe-base v30.0.1 (2026-02-03)
-===================================
-
-Dropped support for Python 3.11.
-Tested on Python 3.14.
-
-New Features
-------------
-
-- Added the ``butler ingest-provenance`` command to ingest the provenance quantum graphs written by ``butler aggregate-graph``. (`DM-52738 <https://rubinobs.atlassian.net/browse/DM-52738>`_)
-- Add report tooling (similar to ``pipetask report``, but faster) to the ``ProvenanceQuantumGraph`` class and the ``butler`` command line (as the new ``provenance-report`` subcommand).
-
-  Updatec ``butler ingest-graph`` to delete now-empty config/metadata/log directories.
-
-  Fix a bug that causes provenance quantum graphs to fail to be written if the address file grew to larger than 2G. (`DM-53851 <https://rubinobs.atlassian.net/browse/DM-53851>`_)
-
-
-API Changes
------------
-
-- Modified ``Instrument.importAll`` so that it now returns information on the instrument classes that were loaded successfully. (`DM-53882 <https://rubinobs.atlassian.net/browse/DM-53882>`_)
-
-
-Bug Fixes
----------
-
-- Fixed ``aggregator-graph`` handling of killed subprocesses to avoid hangs.
-
-  Fixed a race condition in ``aggregate-graph`` that could cause hanging at shutdown on small graphs. (`DM-53913 <https://rubinobs.atlassian.net/browse/DM-53913>`_)
-- Fixed a bug that caused provenance recording to fail in ``SeparablePipelineExecutor`` when ``NoWorkFound`` chaining occurs. (`DM-53977 <https://rubinobs.atlassian.net/browse/DM-53977>`_)
-
-
-Other Changes and Additions
----------------------------
-
-- Now guard against quantum graph builds in which the initial query produces many more result rows than end up in the final graph, which can lead to catastrophically large dimension data storage in the QG file. (`DM-53773 <https://rubinobs.atlassian.net/browse/DM-53773>`_)
-- Bumped minimum Python version to 3.12. (`DM-53998 <https://rubinobs.atlassian.net/browse/DM-53998>`_)
-
-
-lsst-pipe-base v30.0.0 (2026-01-16)
-===================================
-
-New Features
-------------
-
-- Added support for healpix (and other non-database dimensions) in quantum graph builder. (`DM-51176 <https://rubinobs.atlassian.net/browse/DM-51176>`_)
-- Added filtering out dataset refs that the destination butler already knows in ``transfer_from_graph`` as well as dividing the transfer into smaller chunks to speed up restarts. (`DM-51273 <https://rubinobs.atlassian.net/browse/DM-51273>`_)
-- Added handling of ``PrerequisiteInput`` in ``QuantaAdjuster``, with a corresponding unit test. (`DM-51509 <https://rubinobs.atlassian.net/browse/DM-51509>`_)
-- Added ``PredictedQuantumGraph``, a replacement for the ``QuantumGraph`` class with more efficient I/O (via a new file format and more partial-read flexibility).
-
-  The new ``PredictedQuantumGraph`` is now the default in most tooling, and the new format can be opted into via the ``.qg`` (instead of ``.qgraph``) file extension.
-  New files can be read with the old class and vice versa.
-
-  The ``QuantumGraph`` class will eventually be deprecated along with much of the current provenance reporting tooling, but only when the new provenance ecosystem is fully in place. (`DM-51850 <https://rubinobs.atlassian.net/browse/DM-51850>`_)
-- Added a ``rename`` dict in ``ImportIR`` to support renaming task labels, with corresponding unit tests. (`DM-52168 <https://rubinobs.atlassian.net/browse/DM-52168>`_)
-- Added the new ``ProvenanceQuantumGraph`` class and the ``aggregate-graph`` tool (a replacement for ``transfer-from-graph``) that writes it at the end of batch runs. (`DM-52360 <https://rubinobs.atlassian.net/browse/DM-52360>`_)
-- Improved provenance tracking for failed quanta and retries.
-
-  By storing extra information in the log datasets written during execution,
-  we can record caught exceptions, track which other quanta have
-  already executed in the same process, and keep track of previous attempts to
-  run the same quantum. (`DM-53019 <https://rubinobs.atlassian.net/browse/DM-53019>`_)
-- Added provenance writing support to ``MPGraphExecutor`` and ``SeparablePipelineExecutor``. (`DM-53622 <https://rubinobs.atlassian.net/browse/DM-53622>`_)
-
-
-API Changes
------------
-
-- Moved pipeline executors and their support code here, from ``lsst.ctrl.mpexec``.
-
-  This included minor API changes for ``SingleQuantumExecutor`` as well: consistent snake-case naming, keyword-only arguments for construction, and a switch to private instance attributes. (`DM-48980 <https://rubinobs.atlassian.net/browse/DM-48980>`_)
-
-
-Bug Fixes
----------
-
-- Fixed ``transfer-from-graph`` to update chain when asked and output run collection exists even if didn't transfer any datasets. (`DM-51821 <https://rubinobs.atlassian.net/browse/DM-51821>`_)
-- Fixed bug in ``transfer_from_graph`` where the input collections were not flattened before adding to a new output chain. (`DM-52004 <https://rubinobs.atlassian.net/browse/DM-52004>`_)
-- Fixed bug where the log's ``MDC.RUN`` was the empty string when using a quantum-backed butler. (`DM-52676 <https://rubinobs.atlassian.net/browse/DM-52676>`_)
-- Fixed a bug that caused ``PipelineGraph`` objects to be marked as unresolved when loaded from disk. (`DM-52787 <https://rubinobs.atlassian.net/browse/DM-52787>`_)
-
-
-Other Changes and Additions
----------------------------
-
-- The ``Instrument.configPaths`` property can now refer to ``lsst.resources.ResourcePath`` URIs as well as strings (paths or URI strings). (`DM-33226 <https://rubinobs.atlassian.net/browse/DM-33226>`_)
-- Updated pipe_base code to use the constants defined in ``automatic_connection_constants.py``. (`DM-52676 <https://rubinobs.atlassian.net/browse/DM-52676>`_)
-- Uses UUIDs instead of internal integer IDs in new quantum graph storage.
-
-  This includes backwards compatibility read support for predicted quantum graphs, but not provenance quantum graphs, because those are still experimental anyway.
-
-  This increases the size of the files by ~6%, but it simplifies the codebase and will make consolidating multiple small provenance quantum graphs (as we
-  currently anticipate doing for prompt processing) much more efficient. (`DM-53174 <https://rubinobs.atlassian.net/browse/DM-53174>`_)
-- Used context managers to ensure that database resources are freed. (`DM-53370 <https://rubinobs.atlassian.net/browse/DM-53370>`_)
-- Added more logging for the later steps of QG building. (`DM-53636 <https://rubinobs.atlassian.net/browse/DM-53636>`_)
-
-
-An API Removal or Deprecation
------------------------------
-
-- Removes the ``buildExecutionButler`` function and all supporting code.
-
-  Execution butlers (read-only SQLite databases used for batch execution) have been fully superseded by ``lsst.daf.butler.QuantumBackedButler``. (`DM-52044 <https://rubinobs.atlassian.net/browse/DM-52044>`_)
-
-
 lsst-pipe-base v29.1.0 (2025-06-13)
 ===================================
 
@@ -170,7 +65,7 @@ New Features
   Exceptions that lead to task failures are not yet tracked, because we do not write task metadata for failures and hence have nowhere to put the information. (`DM-48536 <https://rubinobs.atlassian.net/browse/DM-48536>`_)
 - Swapped to the new butler query system in ``QuantumGraph`` generation.
 
-  This change should be mostly transparent to users, aside from small changes in speed (typically faster, but not always). (`DM-45896 <https://rubinobs.atlassian.net/browse/DM-45896>`_)
+  This change should be mostly transparent to users, aside from small changes in speed (typically faster, but not always). (`DM-45896 <https://rubinobs.atlassian.net/browse/DM-45896>`)
 
 Bug Fixes
 ---------
@@ -214,7 +109,7 @@ New Features
   For each graph/attempt, the status of each quantum and dataset is recorded in ``QuantumProvenanceGraph.add_new_graph`` and outcomes of quanta over multiple runs are resolved in ``QuantumProvenanceGraph.resolve_duplicates``.
   At the end of this process, we can combine all attempts into a summary.
   This serves to answer the question "What happened to this data ID?" in a holistic sense. (`DM-41711 <https://rubinobs.atlassian.net/browse/DM-41711>`_)
-- Included the number of expected instances in ``pipetask report`` task-level summary for the ``QuantumGraphExecutionReport``. (`DM-44368 <https://rubinobs.atlassian.net/browse/DM-44368>`_)
+- Included the number of expected instances in ``pipetask report`` task-level summary for the `QuantumGraphExecutionReport`. (`DM-44368 <https://rubinobs.atlassian.net/browse/DM-44368>`_)
 - Added mocking support for tasks that write regular datasets with config, log, or metadata storage classes. (`DM-44583 <https://rubinobs.atlassian.net/browse/DM-44583>`_)
 - Added new ``show_dot`` functionality.
 
@@ -290,7 +185,7 @@ New Features
   This interface is available through YAML pipeline specification by specifying the ``labeledSubsetModifyMode`` key when writing YAML import defectives.
 
   New Python interfaces were added for manipulating labeled subsets in a pipeline.
-  These include; ``Pipeline.subsets`` which is a property returning a `dict` of subset labels to sets of task labels, ``Pipeline.addLabeledSubset`` to add a new labeled subset to a ``Pipeline``, and ``Pipeline.removeLabeledSubset`` to remove a labeled subset from a pipeline. (`DM-41203 <https://rubinobs.atlassian.net/browse/DM-41203>`_)
+  These include; ``Pipeline.subsets`` which is a property returning a `dict`` of subset labels to sets of task labels, ``Pipeline.addLabeledSubset`` to add a new labeled subset to a ``Pipeline``, and ``Pipeline.removeLabeledSubset`` to remove a labeled subset from a pipeline. (`DM-41203 <https://rubinobs.atlassian.net/browse/DM-41203>`_)
 - Added ``QuantumGraph`` summary. (`DM-41542 <https://rubinobs.atlassian.net/browse/DM-41542>`_)
 - Added human-readable option to report summary dictionaries. (`DM-41606 <https://rubinobs.atlassian.net/browse/DM-41606>`_)
 - Added a section to pipelines which allows the explicit declaration of which susbsets correspond to steps and the dimensions the step's quanta can be sharded with. (`DM-41650 <https://rubinobs.atlassian.net/browse/DM-41650>`_)

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/doc/lsst.pipe.base/creating-a-pipeline.rst

@@ -150,12 +150,12 @@ associated with ``class`` keyword instead of the label directly. The
 the configuration appropriate for this `Pipeline` specified as an additional
 yaml mapping.
 
-The complete complexity of `lsst.pex.config` can't be represented with simple
+The complete complexity of :ref:`lsst.pex.config` can't be represented with simple
 yaml mapping syntax. To account for this, ``config`` blocks in `Pipeline`\ s
 support two special fields: ``file`` and ``python``.
 
 The ``file`` key may be associated with either a single value pointing to a
-filesystem path where a `lsst.pex.config` file can be found, or a yaml list
+filesystem path where a :ref:`lsst.pex.config` file can be found, or a yaml list
 of such paths. The file paths can contain environment variables that will be
 expanded prior to loading the file(s). These files will then be applied to
 the task during configuration time to override any default values.
@@ -477,7 +477,7 @@ desired camera, or can serve as a base for further `Pipeline`\ s to import.
 Command line options for running Pipelines
 ------------------------------------------
 This section is not intended to serve as a tutorial for processing data from
-the command line, for that refer to `lsst.ctrl.mpexec` or `lsst.ctrl.bps`.
+the command line, for that refer to :ref:`lsst.ctrl.mpexec` or :ref:`lsst.ctrl.bps`.
 However, both of these tools accept URI pointers to a `Pipeline`.  These URIs
 can be altered with a specific syntax which will control how the `Pipeline`
 is loaded.

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/doc/lsst.pipe.base/creating-a-pipelinetask.rst

@@ -142,7 +142,7 @@ not tied to the exact band passes of an individual telescope filter).
 
 Next, take a look at the fields defined on your new connection class. These
 are defined in a similar way as defining a configuration class, but instead
-of using `~lsst.pex.config.Field` types from `lsst.pex.config`,
+of using `~lsst.pex.config.Field` types from :ref:`lsst.pex.config`,
 connection classes make use of connection types defined in
 :py:mod:`lsst.pipe.base.connectionTypes`. These connections define the inputs and outputs that
 a |PipelineTask| will expect to make use of. Each of these connections documents
@@ -471,9 +471,9 @@ connection had never existed.
 Run-time optional inputs
 ------------------------
 
-A separate mechanism exists that allows an ``Input`` connection to be made
+A separate mechanism exists that allows an `Input` connection to be made
 run-time optional.
-If the ``Input.minimum`` attribute is initialized to zero for a connection,
+If the `Input.minimum` attribute is initialized to zero for a connection,
 graph-building will still generate a quantum, and the `PipelineTask` will
 be run, even if no dataset for that input can be found.
 

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/doc/lsst.pipe.base/creating-a-task.rst

@@ -145,7 +145,7 @@ Use the ``__init__`` method (task constructor) to do the following:
 
 - Call the parent task's ``__init__`` method
 - Make subtasks by calling ``self.makeSubtask(name)``, where ``name`` is the name of a field of type `lsst.pex.config.ConfigurableField` in your :ref:`task's configuration <creating-a-task-configuration>`.
-- Make a schema if your task uses an `lsst.afw.table`.
+- Make a schema if your task uses an :ref:`lsst.afw.table`.
   For an example of such a task `lsst.pipe.tasks.calibrate.CalibrateTask`.
 - Initialize any other instance variables your task needs.
 

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/doc/lsst.pipe.base/index.rst

@@ -61,14 +61,6 @@ Developing Pipelines
    testing-pipelines-with-mocks.rst
    working-with-pipeline-graphs.rst
 
-Running Pipelines
------------------
-
-.. toctree::
-   :maxdepth: 1
-
-   recording-provenance.rst
-
 .. _lsst.pipe.base-contributing:
 
 Contributing
@@ -110,10 +102,6 @@ Python API reference
 
 .. automodapi:: lsst.pipe.base.quantum_graph
 
-.. automodapi:: lsst.pipe.base.quantum_graph.aggregator
-
-.. automodapi:: lsst.pipe.base.quantum_graph.ingest_graph
-
 .. automodapi:: lsst.pipe.base.quantum_graph.visualization
 
 QuantumGraph generation API reference

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/doc/lsst.pipe.base/task-framework-overview.rst

@@ -25,14 +25,14 @@ A common use for this is to provide a camera-specific variant of a particular ta
 Tasks may process multiple items of data in parallel, using the ``ctrl_mpexec`` package and its ``pipetask`` command.
 
 Most tasks have a ``run`` method that performs the primary data processing.
-Each task's `~lsst.pipe.base.Task.run` method should return a `~lsst.pipe.base.Struct`.
+Each task's `run` method should return a `~lsst.pipe.base.Struct`.
 This allows named access to returned data, which provides safer evolution than relying on the order of returned values.
 All task methods that return more than one or two items of data should return the data in a `~lsst.pipe.base.Struct`.
 
 Many tasks are found in the ``pipe_tasks`` package, especially tasks that use many different packages and don't seem to belong in any one of them.
-Tasks that are associated with a particular package should be in that package; for example the instrument signature removal task ``lsst.ip.isr.isrTask.IsrTask`` is in the ``ip_isr`` package.
+Tasks that are associated with a particular package should be in that package; for example the instrument signature removal task ``ip.isr.isrTask.IsrTask`` is in the ``ip_isr`` package.
 
-``pipe_base`` is written purely in Python. The most important contents are:
+`pipe_base` is written purely in Python. The most important contents are:
 
 - `~lsst.pipe.base.PipelineTask`: base class for pipeline tasks that can be run from pipelines.
 - `~lsst.pipe.base.Task`: base class for subtasks that are not meant to be run from the

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/doc/lsst.pipe.base/working-with-pipeline-graphs.rst

@@ -64,7 +64,7 @@ In some cases it may be more convenient to add tasks to an existing `PipelineGra
 
 **The most important thing to remember when modifying `PipelineGraph` objects is that modifications typically reset some or all of the graph to an unresolved state.**
 
-The reference documentation for these methods describes exactly what guarantees they make about existing resolutions in detail, and what operations are still supported on unresolved or partially-resolved graphs, but it is easiest to just ensure ``resolve`` is called after any modifications are complete.
+The reference documentation for these methods describes exactly what guarantees they make about existing resolutions in detail, and what operations are still supported on unresolved or partially-resolved graphs, but it is easiest to just ensure `resolve` is called after any modifications are complete.
 
 `PipelineGraph` mutator methods provide strong exception safety (the graph is left unchanged when an exception is raised and caught by calling code) unless the exception type raised is `PipelineGraphExceptionSafetyError`.
 

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lsst-pipe-base"
-requires-python = ">=3.12.0"
+requires-python = ">=3.11.0"
 description = "Pipeline infrastructure for the Rubin Science Pipelines."
 license = "BSD-3-Clause OR GPL-3.0-or-later"
 license-files = ["COPYRIGHT", "LICENSE", "bsd_license.txt", "gpl-v3.0.txt"]
@@ -16,6 +16,7 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "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",
@@ -44,7 +45,6 @@ pipe_base = "lsst.pipe.base.cli:get_cli_subcommands"
 
 [project.urls]
 "Homepage" = "https://github.com/lsst/pipe_base"
-"Source" = "https://github.com/lsst/pipe_base"
 
 [project.optional-dependencies]
 test = ["pytest >= 3.2"]
@@ -101,6 +101,15 @@ version = { attr = "lsst_versions.get_lsst_version" }
         name = "An API Removal or Deprecation"
         showcontent = true
 
+[tool.black]
+line-length = 110
+target-version = ["py311"]
+
+[tool.isort]
+profile = "black"
+line_length = 110
+known_first_party = ["lsst"]
+
 [tool.lsst_versions]
 write_to = "python/lsst/pipe/base/version.py"
 
@@ -131,7 +140,7 @@ add-ignore = ["D107", "D105", "D102", "D100", "D200", "D205", "D400", "D104"]
 
 [tool.ruff]
 line-length = 110
-target-version = "py312"
+target-version = "py311"
 exclude = [
     "__init__.py",
 ]
@@ -195,7 +204,6 @@ checks = [
     "RT01",  # Unfortunately our @property trigger this.
     "RT02",  # Does not want named return value. DM style says we do.
     "SS05",  # pydocstyle is better at finding infinitive verb.
-    "RT03",  # sphinx bug requiring empty Returns.
 ]
 exclude = [
     '^__init__$',

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/python/lsst/pipe/base/_instrument.py

@@ -31,14 +31,14 @@ __all__ = ("Instrument",)
 
 import contextlib
 import datetime
+import os.path
 from abc import ABCMeta, abstractmethod
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any, Self, cast, final
 
-from lsst.daf.butler import DataCoordinate, DataId, DimensionPacker, DimensionRecord, Formatter, FormatterV2
+from lsst.daf.butler import DataCoordinate, DataId, DimensionPacker, DimensionRecord, Formatter
 from lsst.daf.butler.registry import DataIdError
 from lsst.pex.config import Config, RegistryField
-from lsst.resources import ResourcePath, ResourcePathExpression
 from lsst.utils import doImportType
 from lsst.utils.introspection import get_full_type_name
 
@@ -65,10 +65,10 @@ class Instrument(metaclass=ABCMeta):
     the base class.
     """
 
-    configPaths: Sequence[ResourcePathExpression] = ()
+    configPaths: Sequence[str] = ()
     """Paths to config files to read for specific Tasks.
 
-    The paths in this list should contain files of the form ``task.py``, for
+    The paths in this list should contain files of the form `task.py`, for
     each of the Tasks that requires special configuration.
     """
 
@@ -99,8 +99,7 @@ class Instrument(metaclass=ABCMeta):
 
     @abstractmethod
     def register(self, registry: Registry, *, update: bool = False) -> None:
-        """Insert instrument, and other relevant records into a butler
-        registry.
+        """Insert instrument, and other relevant records into `Registry`.
 
         Parameters
         ----------
@@ -110,10 +109,6 @@ class Instrument(metaclass=ABCMeta):
             If `True` (`False` is default), update existing records if they
             differ from the new ones.
 
-        Returns
-        -------
-        None
-
         Raises
         ------
         lsst.daf.butler.registry.ConflictingDefinitionError
@@ -132,6 +127,13 @@ class Instrument(metaclass=ABCMeta):
         the level of individual dimension entries; new detectors and filters
         should be added, but changes to any existing record should not be.
         This can generally be achieved via a block like
+
+        .. code-block:: python
+
+            with registry.transaction():
+                registry.syncDimensionData("instrument", ...)
+                registry.syncDimensionData("detector", ...)
+                self.registerFilters(registry)
         """
         raise NotImplementedError()
 
@@ -312,7 +314,7 @@ class Instrument(metaclass=ABCMeta):
         return instrument_cls(collection_prefix=collection_prefix)
 
     @staticmethod
-    def importAll(registry: Registry) -> dict[str, type[Instrument]]:
+    def importAll(registry: Registry) -> None:
         """Import all the instruments known to this registry.
 
         This will ensure that all metadata translators have been registered.
@@ -322,43 +324,31 @@ class Instrument(metaclass=ABCMeta):
         registry : `lsst.daf.butler.Registry`
             Butler registry to query to find the information.
 
-        Returns
-        -------
-        imported : `dict` [`str`, `type` [`Instrument`]]
-            A mapping containing all the instrument classes that were loaded
-            successfully, keyed by their butler names.
-
         Notes
         -----
         It is allowed for a particular instrument class to fail on import.
         This might simply indicate that a particular obs package has
         not been setup.
         """
-        imported: dict[str, type[Instrument]] = {}
         records = list(registry.queryDimensionRecords("instrument"))
         for record in records:
             cls = record.class_name
-            instrument_name: str = cast(str, record.name)
             with contextlib.suppress(Exception):
-                instr = doImportType(cls)
-                assert issubclass(instr, Instrument)
-                imported[instrument_name] = instr
-        return imported
+                doImportType(cls)
 
     @abstractmethod
-    def getRawFormatter(self, dataId: DataId) -> type[Formatter | FormatterV2]:
+    def getRawFormatter(self, dataId: DataId) -> type[Formatter]:
         """Return the Formatter class that should be used to read a particular
         raw file.
 
         Parameters
         ----------
-        dataId : `lsst.daf.butler.DataId`
+        dataId : `DataId`
             Dimension-based ID for the raw file or files being ingested.
 
         Returns
         -------
-        formatter : `type` \
-                [`lsst.daf.butler.Formatter` | `lsst.daf.butler.FormatterV2` ]
+        formatter : `lsst.daf.butler.Formatter` class
             Class to be used that reads the file into the correct
             Python object for the raw data.
         """
@@ -376,10 +366,9 @@ class Instrument(metaclass=ABCMeta):
             Config instance to which overrides should be applied.
         """
         for root in self.configPaths:
-            resource = ResourcePath(root, forceDirectory=True, forceAbsolute=True)
-            uri = resource.join(f"{name}.py", forceDirectory=False)
-            if uri.exists():
-                config.load(uri)
+            path = os.path.join(root, f"{name}.py")
+            if os.path.exists(path):
+                config.load(path)
 
     @staticmethod
     def formatCollectionTimestamp(timestamp: str | datetime.datetime) -> str:

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/python/lsst/pipe/base/_quantumContext.py

@@ -380,8 +380,8 @@ class QuantumContext:
             if dataset is directly a `list` of `~lsst.daf.butler.DatasetRef`
             or a single `~lsst.daf.butler.DatasetRef`. If ``values.NAME`` is
             None, no output is written.
-        dataset : `OutputQuantizedConnection` or `list` \
-                [`lsst.daf.butler.DatasetRef`] or `lsst.daf.butler.DatasetRef`
+        dataset : `OutputQuantizedConnection` or `list`[`DatasetRef`] \
+                or `DatasetRef`
             This argument may either be an `InputQuantizedConnection` which
             describes all the inputs of a quantum, a list of
             `lsst.daf.butler.DatasetRef`, or a single
@@ -460,7 +460,7 @@ class QuantumContext:
 
         Parameters
         ----------
-        ref : `lsst.daf.butler.DatasetRef`
+        ref : `DatasetRef`
             The dataset to attach provenance to. This dataset must have been
             retrieved by this quantum context.
         extra : `dict` [ `str`, `int` | `float` | `str` | `bool` ]

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/python/lsst/pipe/base/_status.py

@@ -275,23 +275,15 @@ class ExceptionInfo(pydantic.BaseModel):
 class QuantumAttemptStatus(enum.Enum):
     """Enum summarizing an attempt to run a quantum."""
 
-    ABORTED = -4
-    """The quantum failed with a hard error that prevented both logs and
-    metadata from being written.
-
-    This state is only set if information from higher-level tooling (e.g. BPS)
-    is available to distinguish it from ``UNKNOWN``.
-    """
-
     UNKNOWN = -3
     """The status of this attempt is unknown.
 
-    This means no logs or metadata were written, and it at least could not be
-    determined whether the quantum was blocked by an upstream failure (if it
-    was definitely blocked, `BLOCKED` is set instead).
+    This usually means no logs or metadata were written, and it at least could
+    not be determined whether the quantum was blocked by an upstream failure
+    (if it was definitely blocked, `BLOCKED` is set instead).
     """
 
-    ABORTED_SUCCESS = -2
+    LOGS_MISSING = -2
     """Task metadata was written for this attempt but logs were not.
 
     This is a rare condition that requires a hard failure (i.e. the kind that
@@ -300,21 +292,20 @@ class QuantumAttemptStatus(enum.Enum):
     """
 
     FAILED = -1
-    """Execution of the quantum failed gracefully.
+    """Execution of the quantum failed.
 
     This is always set if the task metadata dataset was not written but logs
     were, as is the case when a Python exception is caught and handled by the
-    execution system.
-
-    This status guarantees that the task log dataset was produced but the
-    metadata dataset was not.
+    execution system.  It may also be set in cases where logs were not written
+    either, but other information was available (e.g. from higher-level
+    orchestration tooling) to mark it as a failure.
     """
 
     BLOCKED = 0
     """This quantum was not executed because an upstream quantum failed.
 
-    Upstream quanta with status `UNKNOWN`, `FAILED`, or `ABORTED` are
-    considered blockers; `ABORTED_SUCCESS` is not.
+    Upstream quanta with status `UNKNOWN` or `FAILED` are considered blockers;
+    `LOGS_MISSING` is not.
     """
 
     SUCCESSFUL = 1
@@ -328,30 +319,6 @@ class QuantumAttemptStatus(enum.Enum):
     these "successes with caveats" are reported.
     """
 
-    @property
-    def has_metadata(self) -> bool:
-        """Whether the task metadata dataset was produced."""
-        return self is self.SUCCESSFUL or self is self.ABORTED_SUCCESS
-
-    @property
-    def has_log(self) -> bool:
-        """Whether the log dataset was produced."""
-        return self is self.SUCCESSFUL or self is self.FAILED
-
-    @property
-    def title(self) -> str:
-        """A version of this status' name suitable for use as a title in a plot
-        or table.
-        """
-        return self.name.capitalize().replace("_", " ")
-
-    @property
-    def is_rare(self) -> bool:
-        """Whether this status is rare enough that it should only be listed
-        when it actually occurs.
-        """
-        return self in (self.ABORTED, self.ABORTED_SUCCESS, self.UNKNOWN)
-
 
 class GetSetDictMetadataHolder(Protocol):
     """Protocol for objects that have a ``metadata`` attribute that satisfies

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/python/lsst/pipe/base/_task_metadata.py

@@ -37,7 +37,7 @@ import itertools
 import numbers
 import sys
 from collections.abc import Collection, Iterator, Mapping, Sequence
-from typing import Any, Protocol
+from typing import Any, Protocol, TypeAlias, Union
 
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr
 
@@ -47,7 +47,7 @@ _ALLOWED_PRIMITIVE_TYPES = (str, float, int, bool)
 
 # Note that '|' syntax for unions doesn't work when we have to use a string
 # literal (and we do since it's recursive and not an annotation).
-type NestedMetadataDict = Mapping[str, str | float | int | bool | "NestedMetadataDict"]
+NestedMetadataDict: TypeAlias = Mapping[str, Union[str, float, int, bool, "NestedMetadataDict"]]
 
 
 class PropertySetLike(Protocol):

{lsst_pipe_base-30.0.1rc1 → lsst_pipe_base-30.2025.5100}/python/lsst/pipe/base/all_dimensions_quantum_graph_builder.py

@@ -574,7 +574,7 @@ class _DimensionGroupBranch:
 
         Parameters
         ----------
-        log : `lsst.utils.logging.LsstLogAdapter`
+        log : `lsst.logging.LsstLogAdapter`
             Logger to use for status reporting.
         log_indent : `str`, optional
             Indentation to prefix the log message.  This is used when recursing
@@ -739,7 +739,7 @@ class _DimensionGroupTree:
             Query constraint specified by the user.
         data_id_tables : `~collections.abc.Iterable` [ `astropy.table.Table` ]
             Data ID tables being joined into the query.
-        log : `lsst.utils.logging.LsstLogAdapter`
+        log : `lsst.log.LsstLogAdapter`
             Logger that supports ``verbose`` output.
         """
         universe = self.all_dimensions.universe
@@ -805,7 +805,7 @@ class _DimensionGroupTree:
         ----------
         requested : `DatasetQueryConstraintVariant`
             Query constraint specified by the user.
-        log : `lsst.utils.logging.LsstLogAdapter`
+        log : `lsst.log.LsstLogAdapter`
             Logger that supports ``verbose`` output.
         """
         overall_inputs: dict[str, DatasetTypeNode] = {
@@ -834,11 +834,6 @@ class _DimensionGroupTree:
                         remainder,
                     )
                 self.dataset_constraint.intersection_update(inputs)
-                if not self.dataset_constraint:
-                    raise QuantumGraphBuilderError(
-                        "An explicit dataset query constraint was provided, but it does not include any "
-                        f"inputs to the pipeline subset with tasks {list(self.subgraph.tasks.keys())}."
-                    )
             case _:
                 raise QuantumGraphBuilderError(
                     f"Unable to handle type {requested} given as dataset query constraint."