lsst-pex-config 30.0.0rc2__py3-none-any.whl → 30.0.1rc1__py3-none-any.whl

lsst/pex/config/callStack.py

@@ -102,7 +102,7 @@ class StackFrame:
     getStackFrame
     """
 
-    _STRIP = "/python/lsst/"
+    _STRIP = "/python/"
     """String to strip from the ``filename`` in the constructor."""
 
     def __init__(self, filename, lineno, function, content=None):

lsst/pex/config/choiceField.py

@@ -42,7 +42,7 @@ class ChoiceField(Field[FieldTypeVar]):
     ----------
     doc : `str`
         Documentation string that describes the configuration field.
-    dtype : class
+    dtype : `type`
         The type of the field's choices. For example, `str` or `int`.
     allowed : `dict`
         The allowed values. Keys are the allowed choices (of ``dtype``-type).
@@ -52,9 +52,9 @@ class ChoiceField(Field[FieldTypeVar]):
         choices.
     optional : `bool`, optional
         If `True`, this configuration field is *optional*. Default is `True`.
-    deprecated : None or `str`, optional
+    deprecated : `None` or `str`, optional
         A description of why this Field is deprecated, including removal date.
-        If not None, the string is appended to the docstring for this Field.
+        If not `None`, the string is appended to the docstring for this Field.
 
     See Also
     --------

lsst/pex/config/comparison.py

@@ -70,18 +70,18 @@ def compareScalars(name, v1, v2, output, rtol=1e-8, atol=1e-8, dtype=None):
         Name to use when reporting differences, typically created by
         `getComparisonName`.  This will always appear as the beginning of any
         messages reported via ``output``.
-    v1 : object
+    v1 : `object`
         Left-hand side value to compare.
-    v2 : object
+    v2 : `object`
         Right-hand side value to compare.
-    output : callable or `None`
+    output : `collections.abc.Callable` or `None`
         A callable that takes a string, used (possibly repeatedly) to report
         inequalities (for example, `print`). Set to `None` to disable output.
     rtol : `float`, optional
         Relative tolerance for floating point comparisons.
     atol : `float`, optional
         Absolute tolerance for floating point comparisons.
-    dtype : class, optional
+    dtype : `type`, optional
         Data type of values for comparison. May be `None` if values are not
         floating-point.
 
@@ -130,7 +130,7 @@ def compareConfigs(name, c1, c2, shortcut=True, rtol=1e-8, atol=1e-8, output=Non
         Relative tolerance for floating point comparisons.
     atol : `float`, optional
         Absolute tolerance for floating point comparisons.
-    output : callable, optional
+    output : `collections.abc.Callable`, optional
         A callable that takes a string, used (possibly repeatedly) to report
         inequalities. For example: `print`.
 

lsst/pex/config/config.py

@@ -38,6 +38,7 @@ __all__ = (
 import copy
 import importlib
 import io
+import logging
 import math
 import numbers
 import os
@@ -47,9 +48,13 @@ import sys
 import tempfile
 import warnings
 from collections.abc import Mapping
+from contextlib import contextmanager
+from contextvars import ContextVar
 from types import GenericAlias
 from typing import Any, ForwardRef, Generic, TypeVar, cast, overload
 
+from lsst.resources import ResourcePath, ResourcePathExpression
+
 # if YAML is not available that's fine and we simply don't register
 # the yaml representer since we know it won't be used.
 try:
@@ -74,6 +79,25 @@ else:
     YamlLoaders = ()
     doImport = None
 
+_LOG = logging.getLogger(__name__)
+
+
+# Tracks the current config directory for the current context.
+_config_dir_stack: ContextVar[ResourcePath | None] = ContextVar("_config_dir_stack", default=None)
+
+
+def _get_config_root() -> ResourcePath | None:
+    return _config_dir_stack.get()
+
+
+@contextmanager
+def _push_config_root(dirname: ResourcePath):
+    token = _config_dir_stack.set(dirname)
+    try:
+        yield
+    finally:
+        _config_dir_stack.reset(token)
+
 
 class _PexConfigGenericAlias(GenericAlias):
     """A Subclass of python's GenericAlias used in defining and instantiating
@@ -124,14 +148,14 @@ def _autocast(x, dtype):
 
     Parameters
     ----------
-    x : object
+    x : `object`
         A value.
     dtype : type
         Data type, such as `float`, `int`, or `str`.
 
     Returns
     -------
-    values : object
+    values : `object`
         If appropriate, the returned value is ``x`` cast to the given type
         ``dtype``. If the cast cannot be performed the original value of
         ``x`` is returned.
@@ -276,7 +300,7 @@ class FieldValidationError(ValueError):
 
         See also
         --------
-        lsst.pex.config.Field.name
+        ``lsst.pex.config.Field.name``
         """
 
         self.fullname = _joinNamePath(config._name, field.name)
@@ -297,7 +321,7 @@ class FieldValidationError(ValueError):
         error = (
             f"{self.fieldType.__name__} '{self.fullname}' failed validation: {msg}\n"
             f"For more information see the Field definition at:\n{self.fieldSource.format()}"
-            f" and the Config definition at:\n{self.configSource.format()}"
+            f" and the Config definition for {_typeStr(config)} at:\n{self.configSource.format()}"
         )
         super().__init__(error)
 
@@ -310,14 +334,14 @@ class Field(Generic[FieldTypeVar]):
     ----------
     doc : `str`
         A description of the field for users.
-    dtype : type, optional
+    dtype : `type`, optional
         The field's data type. ``Field`` only supports basic data types:
         `int`, `float`, `complex`, `bool`, and `str`. See
         `Field.supportedTypes`. Optional if supplied as a typing argument to
         the class.
-    default : object, optional
+    default : `object`, optional
         The field's default value.
-    check : callable, optional
+    check : `collections.abc.Callable`, optional
         A callable that is called with the field's value. This callable should
         return `False` if the value is invalid. More complex inter-field
         validation can be written as part of the
@@ -326,7 +350,7 @@ class Field(Generic[FieldTypeVar]):
         This sets whether the field is considered optional, and therefore
         doesn't need to be set by the user. When `False`,
         `lsst.pex.config.Config.validate` fails if the field's value is `None`.
-    deprecated : None or `str`, optional
+    deprecated : `None` or `str`, optional
         A description of why this Field is deprecated, including removal date.
         If not None, the string is appended to the docstring for this Field.
 
@@ -350,7 +374,7 @@ class Field(Generic[FieldTypeVar]):
 
     Notes
     -----
-    ``Field`` instances (including those of any subclass of ``Field``) are used
+    `Field` instances (including those of any subclass of `Field`) are used
     as class attributes of `~lsst.pex.config.Config` subclasses (see the
     example, below). ``Field`` attributes work like the `property` attributes
     of classes that implement custom setters and getters. `Field` attributes
@@ -361,15 +385,15 @@ class Field(Generic[FieldTypeVar]):
     When you access a `Field` attribute on a `Config` instance, you don't
     get the `Field` instance itself. Instead, you get the value of that field,
     which might be a simple type (`int`, `float`, `str`, `bool`) or a custom
-    container type (like a `lsst.pex.config.List`) depending on the field's
-    type. See the example, below.
+    container type (like a `lsst.pex.config.ListField`) depending on the
+    field's type. See the example, below.
 
     Fields can be annotated with a type similar to other python classes (python
     specification `here <https://peps.python.org/pep-0484/#generics>`_ ).
     See the name field in the Config example below for an example of this.
     Unlike most other uses in python, this has an effect at type checking *and*
     runtime. If the type is specified with a class annotation, it will be used
-    as the value of the ``dtype`` in the ``Field`` and there is no need to
+    as the value of the ``dtype`` in the `Field` and there is no need to
     specify it as an argument during instantiation.
 
     There are Some notes on dtype through type annotation syntax. Type
@@ -377,19 +401,20 @@ class Field(Generic[FieldTypeVar]):
     name. i.e. "float", but this cannot be used to resolve circular references.
     Type annotation syntax can be used on an identifier in addition to Class
     assignment i.e. ``variable: Field[str] = Config.someField`` vs
-    ``someField = Field[str](doc="some doc"). However, this syntax is only
+    ``someField = Field[str](doc="some doc")``. However, this syntax is only
     useful for annotating the type of the identifier (i.e. variable in previous
-    example) and does nothing for assigning the dtype of the ``Field``.
+    example) and does nothing for assigning the dtype of the `Field`.
 
     Examples
     --------
-    Instances of ``Field`` should be used as class attributes of
+    Instances of `Field` should be used as class attributes of
     `lsst.pex.config.Config` subclasses:
 
     >>> from lsst.pex.config import Config, Field
     >>> class Example(Config):
     ...     myInt = Field("An integer field.", int, default=0)
     ...     name = Field[str](doc="A string Field")
+    >>> config = Example()
     >>> print(config.myInt)
     0
     >>> config.myInt = 5
@@ -600,7 +625,7 @@ class Field(Generic[FieldTypeVar]):
 
         Parameters
         ----------
-        value : object
+        value : `object`
             The value being validated.
 
         Raises
@@ -642,8 +667,8 @@ class Field(Generic[FieldTypeVar]):
 
         Parameters
         ----------
-        outfile : file-like object
-            A writeable field handle.
+        outfile : `typing.IO`
+            A writeable file handle.
         instance : `~lsst.pex.config.Config`
             The `~lsst.pex.config.Config` instance that contains this field.
 
@@ -684,7 +709,7 @@ class Field(Generic[FieldTypeVar]):
 
         Returns
         -------
-        value : object
+        value : `object`
             The field's value. See *Notes*.
 
         Notes
@@ -843,7 +868,7 @@ class Field(Generic[FieldTypeVar]):
             Relative tolerance for floating point comparisons.
         atol : `float`, optional
             Absolute tolerance for floating point comparisons.
-        output : callable, optional
+        output : `collections.abc.Callable`, optional
             A callable that takes a string, used (possibly repeatedly) to
             report inequalities.
 
@@ -1171,15 +1196,51 @@ class Config(metaclass=ConfigMeta):  # type: ignore
                 e.add_note(f"No field of name {name} exists in config type {_typeStr(self)}")
                 raise
 
+    def _filename_to_resource(
+        self, filename: ResourcePathExpression | None = None
+    ) -> tuple[ResourcePath | None, str]:
+        """Create resource path from filename.
+
+        Parameters
+        ----------
+        filename : `lsst.resources.ResourcePathExpression` or `None`
+            The URI expression associated with this config. Can be `None`
+            if no file URI is known.
+
+        Returns
+        -------
+        resource : `lsst.resources.ResourcePath` or `None`
+            The resource version of the filename. Returns `None` if no filename
+            was given or refers to unspecified value.
+        file_string : `str`
+            String form of the resource for use in ``__file__``
+        """
+        if filename is None or filename in ("?", "<unknown>"):
+            return None, "<unknown>"
+        base = _get_config_root()
+        resource = ResourcePath(filename, forceAbsolute=True, forceDirectory=False, root=base)
+
+        # Preferred definition of __file__ is the full OS path. If a config
+        # is loaded with a relative path it must be converted to the absolute
+        # path to avoid confusion with later relative paths referenced inside
+        # the config.
+        if resource.scheme == "file":
+            file_string = resource.ospath
+        else:
+            file_string = str(resource)
+
+        return resource, file_string
+
     def load(self, filename, root="config"):
         """Modify this config in place by executing the Python code in a
         configuration file.
 
         Parameters
         ----------
-        filename : `str`
-            Name of the configuration file. A configuration file is Python
-            module.
+        filename : `lsst.resources.ResourcePathExpression`
+            Name of the configuration URI. A configuration file is a Python
+            module. Since configuration files are Python code, remote URIs
+            are not allowed.
         root : `str`, optional
             Name of the variable in file that refers to the config being
             overridden.
@@ -1199,9 +1260,21 @@ class Config(metaclass=ConfigMeta):  # type: ignore
         lsst.pex.config.Config.saveToStream
         lsst.pex.config.Config.saveToString
         """
-        with open(filename) as f:
-            code = compile(f.read(), filename=filename, mode="exec")
-            self.loadFromString(code, root=root, filename=filename)
+        resource, file_string = self._filename_to_resource(filename)
+        if resource is None:
+            # A filename is required.
+            raise ValueError(f"Undefined URI provided to load command: {filename}.")
+
+        if resource.scheme not in ("file", "eups", "resource"):
+            raise ValueError(f"Remote URI ({resource}) can not be used to load configurations.")
+
+        # Push the directory of the file we are now reading onto the stack
+        # so that nested loads are relative to this file.
+        with _push_config_root(resource.dirname()):
+            _LOG.debug("Updating config from URI %s", str(resource))
+            with resource.open("r") as f:
+                code = compile(f.read(), filename=file_string, mode="exec")
+            self._loadFromString(code, root=root, filename=file_string)
 
     def loadFromStream(self, stream, root="config", filename=None, extraLocals=None):
         """Modify this Config in place by executing the Python code in the
@@ -1209,7 +1282,7 @@ class Config(metaclass=ConfigMeta):  # type: ignore
 
         Parameters
         ----------
-        stream : file-like object, `str`, `bytes`, or `~types.CodeType`
+        stream : `typing.IO`, `str`, `bytes`, or `~types.CodeType`
             Stream containing configuration override code.  If this is a
             code object, it should be compiled with ``mode="exec"``.
         root : `str`, optional
@@ -1224,7 +1297,8 @@ class Config(metaclass=ConfigMeta):  # type: ignore
             Then this config's field ``myField`` is set to ``5``.
         filename : `str`, optional
             Name of the configuration file, or `None` if unknown or contained
-            in the stream. Used for error reporting.
+            in the stream. Used for error reporting and to set ``__file__``
+            variable in config.
         extraLocals : `dict` of `str` to `object`, optional
             Any extra variables to include in local scope when loading.
 
@@ -1244,7 +1318,7 @@ class Config(metaclass=ConfigMeta):  # type: ignore
         """
         if hasattr(stream, "read"):
             if filename is None:
-                filename = getattr(stream, "name", "?")
+                filename = getattr(stream, "name", "<unknown>")
             code = compile(stream.read(), filename=filename, mode="exec")
         else:
             code = stream
@@ -1268,9 +1342,11 @@ class Config(metaclass=ConfigMeta):  # type: ignore
                 config.myField = 5
 
             Then this config's field ``myField`` is set to ``5``.
-        filename : `str`, optional
-            Name of the configuration file, or `None` if unknown or contained
-            in the stream. Used for error reporting.
+        filename : `lsst.resources.ResourcePathExpression`, optional
+            URI of the configuration file, or `None` if unknown or contained
+            in the stream. Used for error reporting and to set ``__file__``
+            variable. Required to be set if the string config attempts to
+            load other configs using either relative path or ``__file__``.
         extraLocals : `dict` of `str` to `object`, optional
             Any extra variables to include in local scope when loading.
 
@@ -1291,7 +1367,24 @@ class Config(metaclass=ConfigMeta):  # type: ignore
         if filename is None:
             # try to determine the file name; a compiled string
             # has attribute "co_filename",
-            filename = getattr(code, "co_filename", "?")
+            filename = getattr(code, "co_filename", "<unknown>")
+
+        resource, file_string = self._filename_to_resource(filename)
+        if resource is None:
+            # No idea where this config came from so no ability to deal with
+            # relative paths. No reason to use context.
+            self._loadFromString(code, root=root, filename=filename, extraLocals=extraLocals)
+        else:
+            # Push the directory of the file we are now reading onto the stack
+            # so that nested loads are relative to this file.
+            with _push_config_root(resource.dirname()):
+                self._loadFromString(code, root=root, filename=file_string, extraLocals=extraLocals)
+
+    def _loadFromString(self, code, root="config", filename=None, extraLocals=None):
+        """Update config from string.
+
+        Assumes relative directory path context has been setup by caller.
+        """
         with RecordingImporter() as importer:
             globals = {"__file__": filename}
             local = {root: self}
@@ -1374,7 +1467,7 @@ class Config(metaclass=ConfigMeta):  # type: ignore
 
         Parameters
         ----------
-        outfile : file-like object
+        outfile : `typing.TextIO`
             Destination file object write the config into. Accepts strings not
             bytes.
         root : `str`, optional
@@ -1428,7 +1521,7 @@ class Config(metaclass=ConfigMeta):  # type: ignore
 
         Parameters
         ----------
-        outfile : file-like object
+        outfile : `typing.TextIO`
             Destination file object write the config into. Accepts strings not
             bytes.
         """
@@ -1663,7 +1756,7 @@ class Config(metaclass=ConfigMeta):  # type: ignore
             Relative tolerance for floating point comparisons.
         atol : `float`, optional
             Absolute tolerance for floating point comparisons.
-        output : callable, optional
+        output : `collections.abc.Callable`, optional
             A callable that takes a string, used (possibly repeatedly) to
             report inequalities.
 
@@ -1784,7 +1877,7 @@ def unreduceConfig(cls_, stream):
     cls_ : `lsst.pex.config.Config`-type
         A `lsst.pex.config.Config` type (not an instance) that is instantiated
         with configurations in the ``stream``.
-    stream : file-like object, `str`, or `~types.CodeType`
+    stream : `typing.IO`, `str`, or `~types.CodeType`
         Stream containing configuration override code.
 
     Returns

lsst/pex/config/configChoiceField.py

@@ -192,7 +192,7 @@ class ConfigInstanceDict(collections.abc.Mapping[str, Config]):
         result._typemap = self._typemap
         if self._selection is not None:
             if self._field.multi:
-                result._selection = SelectionSet(result._dict, self._selection._set)
+                result._selection = SelectionSet(self, self._selection._set)
             else:
                 result._selection = self._selection
         return result
@@ -412,9 +412,9 @@ class ConfigChoiceField(Field[ConfigInstanceDict]):
         If `False`, the field allows only a single selection. In this case,
         set the active config by assigning the config's key from the
         ``typemap`` to the field's ``name`` attribute (see *Examples*).
-    deprecated : None or `str`, optional
+    deprecated : `None` or `str`, optional
         A description of why this Field is deprecated, including removal date.
-        If not None, the string is appended to the docstring for this Field.
+        If not `None`, the string is appended to the docstring for this Field.
 
     See Also
     --------
@@ -650,7 +650,7 @@ class ConfigChoiceField(Field[ConfigInstanceDict]):
             Relative tolerance for floating point comparisons.
         atol : `float`
             Absolute tolerance for floating point comparisons.
-        output : callable
+        output : `collections.abc.Callable`
             A callable that takes a string, used (possibly repeatedly) to
             report inequalities.
 

lsst/pex/config/configDictField.py

@@ -76,7 +76,7 @@ class ConfigDict(Dict[str, Config]):
         return type(self)(
             config,
             self._field,
-            {k: v._copy() for k, v in self._dict.items()},
+            {k: v.copy() for k, v in self._dict.items()},
             at=None,
             label="copy",
             setHistory=False,
@@ -148,7 +148,7 @@ class ConfigDictField(DictField):
     itemtype : `lsst.pex.config.Config`-type
         The type of the values in the mapping. This must be
         `~lsst.pex.config.Config` or a subclass.
-    default : optional
+    default : `typing.Any`, optional
         Unknown.
     default : ``itemtype``-dtype, optional
         Default value of this field.
@@ -161,9 +161,9 @@ class ConfigDictField(DictField):
         Callable to check a key.
     itemCheck : `~collections.abc.Callable` or `None`, optional
         Callable to check an item.
-    deprecated : None or `str`, optional
+    deprecated : `None` or `str`, optional
         A description of why this Field is deprecated, including removal date.
-        If not None, the string is appended to the docstring for this Field.
+        If not `None`, the string is appended to the docstring for this Field.
 
     Raises
     ------
@@ -171,7 +171,7 @@ class ConfigDictField(DictField):
         Raised if the inputs are invalid:
 
         - ``keytype`` or ``itemtype`` arguments are not supported types
-          (members of `ConfigDictField.supportedTypes`.
+          (members of `Field.supportedTypes`.
         - ``dictCheck``, ``keyCheck`` or ``itemCheck`` is not a callable
           function.
 
@@ -326,7 +326,7 @@ class ConfigDictField(DictField):
             Relative tolerance for floating point comparisons.
         atol : `float`
             Absolute tolerance for floating point comparisons.
-        output : callable
+        output : `collections.abc.Callable`
             A callable that takes a string, used (possibly repeatedly) to
             report inequalities.
 

lsst/pex/config/configField.py

@@ -52,12 +52,12 @@ class ConfigField(Field[FieldTypeVar]):
         considered equivalent to assigning a default-constructed sub-config.
         This means that the argument default can be ``dtype``, as well as an
         instance of ``dtype``.
-    check : callable, optional
+    check : `collections.abc.Callable`, optional
         A callback function that validates the field's value, returning `True`
         if the value is valid, and `False` otherwise.
-    deprecated : None or `str`, optional
+    deprecated : `None` or `str`, optional
         A description of why this Field is deprecated, including removal date.
-        If not None, the string is appended to the docstring for this Field.
+        If not `None`, the string is appended to the docstring for this Field.
 
     See Also
     --------
@@ -178,7 +178,7 @@ class ConfigField(Field[FieldTypeVar]):
 
         Parameters
         ----------
-        outfile : file-like object
+        outfile : `typing.IO`
             A writeable field handle.
         instance : `~lsst.pex.config.Config`
             The `~lsst.pex.config.Config` instance that contains this field.
@@ -226,7 +226,7 @@ class ConfigField(Field[FieldTypeVar]):
 
         Returns
         -------
-        value : object
+        value : `object`
             The field's value. See *Notes*.
 
         Notes
@@ -299,7 +299,7 @@ class ConfigField(Field[FieldTypeVar]):
             Relative tolerance for floating point comparisons.
         atol : `float`
             Absolute tolerance for floating point comparisons.
-        output : callable
+        output : `collections.abc.Callable`
             A callable that takes a string, used (possibly repeatedly) to
             report inequalities.
 

lsst/pex/config/configurableActions/_configurableActionStructField.py

@@ -446,7 +446,7 @@ class ConfigurableActionStructField(Field[ActionTypeVar]):
             Relative tolerance for floating point comparisons.
         atol : `float`
             Absolute tolerance for floating point comparisons.
-        output : callable
+        output : `collections.abc.Callable`
             A callable that takes a string, used (possibly repeatedly) to
             report inequalities.
 

lsst/pex/config/configurableField.py

@@ -247,7 +247,7 @@ class ConfigurableField(Field[ConfigurableInstance[FieldTypeVar]]):
     ----------
     doc : `str`
         A description of the configuration field.
-    target : configurable class
+    target : `lsst.pipe.base.Task` or other configurable class
         The configurable target. Configurables have a ``ConfigClass``
         attribute. Within the task framework, configurables are
         `lsst.pipe.base.Task` subclasses).
@@ -255,16 +255,16 @@ class ConfigurableField(Field[ConfigurableInstance[FieldTypeVar]]):
         The subclass of `lsst.pex.config.Config` expected as the configuration
         class of the ``target``. If ``ConfigClass`` is unset then
         ``target.ConfigClass`` is used.
-    default : ``ConfigClass``-type, optional
+    default : `type`, optional
         The default configuration class. Normally this parameter is not set,
         and defaults to ``ConfigClass`` (or ``target.ConfigClass``).
-    check : callable, optional
+    check : `collections.abc.Callable`, optional
         Callable that takes the field's value (the ``target``) as its only
         positional argument, and returns `True` if the ``target`` is valid (and
         `False` otherwise).
-    deprecated : None or `str`, optional
+    deprecated : `None` or `str`, optional
         A description of why this Field is deprecated, including removal date.
-        If not None, the string is appended to the docstring for this Field.
+        If not `None`, the string is appended to the docstring for this Field.
 
     See Also
     --------
@@ -289,7 +289,7 @@ class ConfigurableField(Field[ConfigurableInstance[FieldTypeVar]]):
 
         Parameters
         ----------
-        target : configurable class
+        target : `type`
             The configurable being verified.
         ConfigClass : `lsst.pex.config.Config`-type or `None`
             The configuration class associated with the ``target``. This can
@@ -486,7 +486,7 @@ class ConfigurableField(Field[ConfigurableInstance[FieldTypeVar]]):
             Relative tolerance for floating point comparisons.
         atol : `float`
             Absolute tolerance for floating point comparisons.
-        output : callable
+        output : `collections.abc.Callable`
             A callable that takes a string, used (possibly repeatedly) to
             report inequalities. For example: `print`.
 

lsst/pex/config/dictField.py

@@ -229,15 +229,15 @@ class DictField(Field[Dict[KeyTypeVar, ItemTypeVar]], Generic[KeyTypeVar, ItemTy
         The default mapping.
     optional : `bool`, optional
         If `True`, the field doesn't need to have a set value.
-    dictCheck : callable
+    dictCheck : `collections.abc.Callable`
         A function that validates the dictionary as a whole.
-    keyCheck : callable
+    keyCheck : `collections.abc.Callable`
         A function that validates individual mapping keys.
-    itemCheck : callable
+    itemCheck : `collections.abc.Callable`
         A function that validates individual mapping values.
-    deprecated : None or `str`, optional
+    deprecated : `None` or `str`, optional
         A description of why this Field is deprecated, including removal date.
-        If not None, the string is appended to the docstring for this Field.
+        If not `None`, the string is appended to the docstring for this Field.
 
     See Also
     --------
@@ -439,7 +439,7 @@ class DictField(Field[Dict[KeyTypeVar, ItemTypeVar]], Generic[KeyTypeVar, ItemTy
             Relative tolerance for floating point comparisons.
         atol : `float`
             Absolute tolerance for floating point comparisons.
-        output : callable
+        output : `collections.abc.Callable`
             A callable that takes a string, used (possibly repeatedly) to
             report inequalities.
 

lsst/pex/config/listField.py

@@ -57,7 +57,7 @@ class List(collections.abc.MutableSequence[FieldTypeVar]):
         Config instance that contains the ``field``.
     field : `ListField`
         Instance of the `ListField` using this ``List``.
-    value : sequence
+    value : `collections.abc.Sequence`
         Sequence of values that are inserted into this ``List``.
     at : `list` of `~lsst.pex.config.callStack.StackFrame`
         The call stack (created by `lsst.pex.config.callStack.getCallStack`).
@@ -114,7 +114,7 @@ class List(collections.abc.MutableSequence[FieldTypeVar]):
         ----------
         i : `int`
             Index of the item in the `list`.
-        x : object
+        x : `object`
             Item in the `list`.
 
         Raises
@@ -215,7 +215,7 @@ class List(collections.abc.MutableSequence[FieldTypeVar]):
         ----------
         i : `int`
             Index where the item is inserted.
-        x : object
+        x : `object`
             Item that is inserted.
         at : `list` of `~lsst.pex.config.callStack.StackFrame` or `None`,\
                 optional
@@ -283,18 +283,18 @@ class ListField(Field[List[FieldTypeVar]], Generic[FieldTypeVar]):
     ----------
     doc : `str`
         A description of the field.
-    dtype : class, optional
+    dtype : `type`, optional
         The data type of items in the list. Optional if supplied as typing
         argument to the class.
-    default : sequence, optional
+    default : `collections.abc.Sequence`, optional
         The default items for the field.
     optional : `bool`, optional
         Set whether the field is *optional*. When `False`,
         `lsst.pex.config.Config.validate` will fail if the field's value is
         `None`.
-    listCheck : callable, optional
+    listCheck : `collections.abc.Callable`, optional
         A callable that validates the list as a whole.
-    itemCheck : callable, optional
+    itemCheck : `collections.abc.Callable`, optional
         A callable that validates individual items in the list.
     length : `int`, optional
         If set, this field must contain exactly ``length`` number of items.
@@ -304,9 +304,9 @@ class ListField(Field[List[FieldTypeVar]], Generic[FieldTypeVar]):
     maxLength : `int`, optional
         If set, this field must contain *no more than* ``maxLength`` number of
         items.
-    deprecated : None or `str`, optional
+    deprecated : `None` or `str`, optional
         A description of why this Field is deprecated, including removal date.
-        If not None, the string is appended to the docstring for this Field.
+        If not `None`, the string is appended to the docstring for this Field.
 
     See Also
     --------
@@ -503,7 +503,7 @@ class ListField(Field[List[FieldTypeVar]], Generic[FieldTypeVar]):
             Relative tolerance for floating point comparisons.
         atol : `float`
             Absolute tolerance for floating point comparisons.
-        output : callable
+        output : `collections.abc.Callable`
             If not None, a callable that takes a `str`, used (possibly
             repeatedly) to report inequalities.
 

lsst/pex/config/rangeField.py

@@ -56,9 +56,9 @@ class RangeField(Field):
         If `True`, the ``min`` value is included in the allowed range.
     inclusiveMax : `bool`, optional
         If `True`, the ``max`` value is included in the allowed range.
-    deprecated : None or `str`, optional
+    deprecated : `None` or `str`, optional
         A description of why this Field is deprecated, including removal date.
-        If not None, the string is appended to the docstring for this Field.
+        If not `None`, the string is appended to the docstring for this Field.
 
     See Also
     --------

lsst/pex/config/registry.py

@@ -42,7 +42,7 @@ class ConfigurableWrapper:
 
     Parameters
     ----------
-    target : configurable class
+    target : `lsst.pipe.base.Task` or other configurable class
         Target class.
     ConfigClass : `type`
         Config class.
@@ -135,7 +135,7 @@ class Registry(collections.abc.Mapping):
             Name that the ``target`` is registered under. The target can
             be accessed later with `dict`-like patterns using ``name`` as
             the key.
-        target : obj
+        target : `lsst.pipe.base.Task` or other configurable type
             A configurable type, usually a subclass of `lsst.pipe.base.Task`.
         ConfigClass : `lsst.pex.config.Config`-type, optional
             A subclass of `lsst.pex.config.Config` used to configure the
@@ -188,7 +188,7 @@ class Registry(collections.abc.Mapping):
         ----------
         doc : `str`
             A description of the field.
-        default : object, optional
+        default : `object`, optional
             The default target for the field.
         optional : `bool`, optional
             When `False`, `lsst.pex.config.Config.validate` fails if the
@@ -456,7 +456,7 @@ def registerConfig(name, registry, target):
         Name of the ``target`` in the ``registry``.
     registry : `Registry`
         The registry containing the ``target``.
-    target : obj
+    target : `lsst.pipe.base.Task` or other configurable type
         A configurable type, such as a subclass of `lsst.pipe.base.Task`.
 
     See Also

lsst/pex/config/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "30.0.0rc2"
+__version__ = "30.0.1rc1"

lsst/pex/config/wrap.py

@@ -61,7 +61,7 @@ def makeConfigClass(ctrl, name=None, base=Config, doc=None, module=None, cls=Non
 
     Parameters
     ----------
-    ctrl : class
+    ctrl : `type`
         C++ control class to wrap.
     name : `str`, optional
         Name of the new config class; defaults to the ``__name__`` of the
@@ -70,7 +70,7 @@ def makeConfigClass(ctrl, name=None, base=Config, doc=None, module=None, cls=Non
         Base class for the config class.
     doc : `str`, optional
         Docstring for the config class.
-    module : object, `str`, `int`, or `None` optional
+    module : `object`, `str`, `int`, or `None` optional
         Either a module object, a string specifying the name of the module, or
         an integer specifying how far back in the stack to look for the module
         to use: 0 is the immediate caller of `~lsst.pex.config.wrap`. This will
@@ -78,7 +78,7 @@ def makeConfigClass(ctrl, name=None, base=Config, doc=None, module=None, cls=Non
         will also be added to the module. Ignored if `None` or if ``cls`` is
         not `None`. Defaults to None in which case module is looked up from the
         module of ctrl.
-    cls : class
+    cls : `type` [`lsst.pex.config.Config`]
         An existing config class to use instead of creating a new one; name,
         base doc, and module will be ignored if this is not `None`.
 
@@ -316,7 +316,7 @@ def wrap(ctrl):
 
     Parameters
     ----------
-    ctrl : object
+    ctrl : `object`
         The C++ control class.
 
     Notes

{lsst_pex_config-30.0.0rc2.dist-info → lsst_pex_config-30.0.1rc1.dist-info}/METADATA

@@ -1,20 +1,21 @@
 Metadata-Version: 2.4
 Name: lsst-pex-config
-Version: 30.0.0rc2
+Version: 30.0.1rc1
 Summary: A flexible configuration system using Python files.
 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/pex_config
+Project-URL: Source, https://github.com/lsst/pex_config
 Keywords: lsst
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Astronomy
-Requires-Python: >=3.10.0
+Requires-Python: >=3.11.0
 Description-Content-Type: text/x-rst
 License-File: COPYRIGHT
 License-File: LICENSE
@@ -22,6 +23,7 @@ License-File: gpl-v3.0.txt
 License-File: bsd_license.txt
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: numpy>=1.17
+Requires-Dist: lsst-resources
 Provides-Extra: test
 Requires-Dist: pytest>=3.2; extra == "test"
 Requires-Dist: pytest-openfiles>=0.5.0; extra == "test"

lsst_pex_config-30.0.1rc1.dist-info/RECORD

@@ -0,0 +1,35 @@
+lsst/__init__.py,sha256=_2bZAHuDVAx7MM7KA7pt3DYp641NY4RzSoRAwesWKfU,67
+lsst/pex/__init__.py,sha256=_2bZAHuDVAx7MM7KA7pt3DYp641NY4RzSoRAwesWKfU,67
+lsst/pex/config/__init__.py,sha256=wv2iwYszZA11Uyz4AFV2cnURBuKi2dHy9H-41FLzHvo,1282
+lsst/pex/config/_doNotImportMe.py,sha256=AYqqE8aIHH711hPcZJssplBsIIW4xCbz2oZqRNheI3I,87
+lsst/pex/config/callStack.py,sha256=qfD3FrqG7U_odTdd9BpNGmWopUw_fE2f3Yu_fk5mn60,5912
+lsst/pex/config/choiceField.py,sha256=7tevtgxgJju6HwFBE1de3FUwh3gOzJOvVnrUzXYYg-w,4282
+lsst/pex/config/comparison.py,sha256=4ZF8tLlGF2mR0log_aYvQfMbWcYQIqSo3VXBsek-W6E,6361
+lsst/pex/config/config.py,sha256=nqXko3p0hVu17JK8cyO64D8pRacF5WIbF6rU_2rU6CA,67036
+lsst/pex/config/configChoiceField.py,sha256=ZPcXE1OCM-XkUH7JVGQ3ExKWaHidCLohKYq6p47wvs8,24453
+lsst/pex/config/configDictField.py,sha256=PFe0jn9RqZUGMBw5biBYK1H-7NWBrKfdYPeBP6vdO4g,12918
+lsst/pex/config/configField.py,sha256=esu0VjB04ZMgcDkTt_VZVaAnoa3swEhO3FswzBbrR54,11692
+lsst/pex/config/configurableField.py,sha256=nVCABJ1R3PsD-lsCSQr4VRoCox5B4A1uRRAB9n-uZh4,19040
+lsst/pex/config/convert.py,sha256=dBTLjkcoh3lM6FxtY9DV33iLOtD6V0PMni6O2b9K4Ww,2397
+lsst/pex/config/dictField.py,sha256=8lc6k4pos1FBIZgmTuF0HYfnfA9qujnhAQkpxMWWVVI,17538
+lsst/pex/config/history.py,sha256=k6ecRik20basI2WAtYuhHd1TotrjB15Io59o2yMMqHg,8373
+lsst/pex/config/listField.py,sha256=UYQodU2UWSp3-4yu4N61S3twdupV1lRoOXONxFcXFxU,18955
+lsst/pex/config/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lsst/pex/config/rangeField.py,sha256=shOHUL7zxiRbjqfDuuThq7AuLxZmZyANFUwd98hm0Ao,5433
+lsst/pex/config/registry.py,sha256=Ew6eS6S3DWPfWHFiYDNOXeyXi9CrH6wGvvaSXstpGRg,15913
+lsst/pex/config/version.py,sha256=-auEgPcWk4qAWrWVMJY7Of7dAJ0dNQHoqQraCNdAEN4,52
+lsst/pex/config/wrap.py,sha256=Oc_H55EYFg9VNlQz4mvevq1TOcn6Z_kgLhwznJ9BcpU,12997
+lsst/pex/config/configurableActions/__init__.py,sha256=kwMbhFr3LirwEqzgHij7CxWF_xki3UYeajzveb4vpTI,1039
+lsst/pex/config/configurableActions/_configurableAction.py,sha256=KZiYYzIQHNeUhDxS1DMb_D9X28_LOzLyNXclaOW-ApY,2784
+lsst/pex/config/configurableActions/_configurableActionField.py,sha256=E1uVrGIvu64QDJL76sW3LlIrR30-NJs0ZQeofy-iVEs,5353
+lsst/pex/config/configurableActions/_configurableActionStructField.py,sha256=65dbNZ-HR3xVURYDX7tth2o0aC8zbZdCnNy9iZmBlEA,17772
+lsst/pex/config/configurableActions/tests.py,sha256=aisHgzghfR4NFQD22NU2K5pNilCjAwcJTSMs0vK7dzI,3039
+lsst_pex_config-30.0.1rc1.dist-info/licenses/COPYRIGHT,sha256=J3bcuh9PTaTU9iNjxE-9THWEwoo5drYshgYvZVgUKoI,381
+lsst_pex_config-30.0.1rc1.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
+lsst_pex_config-30.0.1rc1.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
+lsst_pex_config-30.0.1rc1.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lsst_pex_config-30.0.1rc1.dist-info/METADATA,sha256=B1qkUubOp3JrWvUQR8mr6eeYeJSSntHVC6T9qyVpQys,2292
+lsst_pex_config-30.0.1rc1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+lsst_pex_config-30.0.1rc1.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_pex_config-30.0.1rc1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_pex_config-30.0.1rc1.dist-info/RECORD,,

{lsst_pex_config-30.0.0rc2.dist-info → lsst_pex_config-30.0.1rc1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

lsst_pex_config-30.0.0rc2.dist-info/RECORD

@@ -1,35 +0,0 @@
-lsst/__init__.py,sha256=_2bZAHuDVAx7MM7KA7pt3DYp641NY4RzSoRAwesWKfU,67
-lsst/pex/__init__.py,sha256=_2bZAHuDVAx7MM7KA7pt3DYp641NY4RzSoRAwesWKfU,67
-lsst/pex/config/__init__.py,sha256=wv2iwYszZA11Uyz4AFV2cnURBuKi2dHy9H-41FLzHvo,1282
-lsst/pex/config/_doNotImportMe.py,sha256=AYqqE8aIHH711hPcZJssplBsIIW4xCbz2oZqRNheI3I,87
-lsst/pex/config/callStack.py,sha256=HxcH1QpYERsR68sBLs8jqX3Gj85e28vhCCjCy6lnVaE,5917
-lsst/pex/config/choiceField.py,sha256=S_ygw6coQaKNIstpQxKF-MMsX0agdEZtqZuEcK1EYJg,4277
-lsst/pex/config/comparison.py,sha256=2zbOdMD5aOC3ccI2NJSxtiI59wLMmssuP9oxdXBvzaE,6320
-lsst/pex/config/config.py,sha256=DPlN6tLVJawAaJPuxTjjDZQGYPnwWOv1cGq5myFoNQU,63028
-lsst/pex/config/configChoiceField.py,sha256=CbISBYgMuKEJyed2G6f8XEodL-98O3L2Haxc8Dx_s1I,24439
-lsst/pex/config/configDictField.py,sha256=gnVi52CHB3B0K-NNC3NUZDxi556pFJnVSF4-73JlJw4,12893
-lsst/pex/config/configField.py,sha256=9jSPSHO_9p-499SmJgvMWBbizAl4p1jTQrtlib1gXHo,11655
-lsst/pex/config/configurableField.py,sha256=-nYA54G6UJLVzB_lQgPRiCMQJ_yv9c-43uxyCJkH198,18995
-lsst/pex/config/convert.py,sha256=dBTLjkcoh3lM6FxtY9DV33iLOtD6V0PMni6O2b9K4Ww,2397
-lsst/pex/config/dictField.py,sha256=zCzW0yduPDKH_eSwtYT5pcTT-sAejcWvn6xwvH33HAE,17462
-lsst/pex/config/history.py,sha256=k6ecRik20basI2WAtYuhHd1TotrjB15Io59o2yMMqHg,8373
-lsst/pex/config/listField.py,sha256=H0j1TR3jTxUM80vcBWmoNlCCjd1HFSP15UxiR56gBxY,18856
-lsst/pex/config/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lsst/pex/config/rangeField.py,sha256=VmfcAoLYRJIdIsnFQIFlVYKrmNnfGX6Ef9enEYkFTx8,5429
-lsst/pex/config/registry.py,sha256=JKy6kXOumSYDoOdHlg4oBGeQN7pmMSOgCJCXylEI6yM,15790
-lsst/pex/config/version.py,sha256=CrAQNQjb1NNXqaNvScI53U2GvkmrnpRtyOiy0bIrcl4,52
-lsst/pex/config/wrap.py,sha256=t8s5KzN2kJ-oW8AJTZrz4xAl0Qtpvnqo9H6rQKRBK_s,12964
-lsst/pex/config/configurableActions/__init__.py,sha256=kwMbhFr3LirwEqzgHij7CxWF_xki3UYeajzveb4vpTI,1039
-lsst/pex/config/configurableActions/_configurableAction.py,sha256=KZiYYzIQHNeUhDxS1DMb_D9X28_LOzLyNXclaOW-ApY,2784
-lsst/pex/config/configurableActions/_configurableActionField.py,sha256=E1uVrGIvu64QDJL76sW3LlIrR30-NJs0ZQeofy-iVEs,5353
-lsst/pex/config/configurableActions/_configurableActionStructField.py,sha256=HL53MsLh1DaKmZBD3midrHcB8tbJ46lNBwerjne0qrg,17754
-lsst/pex/config/configurableActions/tests.py,sha256=aisHgzghfR4NFQD22NU2K5pNilCjAwcJTSMs0vK7dzI,3039
-lsst_pex_config-30.0.0rc2.dist-info/licenses/COPYRIGHT,sha256=J3bcuh9PTaTU9iNjxE-9THWEwoo5drYshgYvZVgUKoI,381
-lsst_pex_config-30.0.0rc2.dist-info/licenses/LICENSE,sha256=pRExkS03v0MQW-neNfIcaSL6aiAnoLxYgtZoFzQ6zkM,232
-lsst_pex_config-30.0.0rc2.dist-info/licenses/bsd_license.txt,sha256=7MIcv8QRX9guUtqPSBDMPz2SnZ5swI-xZMqm_VDSfxY,1606
-lsst_pex_config-30.0.0rc2.dist-info/licenses/gpl-v3.0.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lsst_pex_config-30.0.0rc2.dist-info/METADATA,sha256=mJscy7ZVKy3me7ddU2jrehkQdhZWvt1gQ4J0jM2wYho,2206
-lsst_pex_config-30.0.0rc2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lsst_pex_config-30.0.0rc2.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_pex_config-30.0.0rc2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_pex_config-30.0.0rc2.dist-info/RECORD,,