lsst-daf-butler 30.0.0rc3__py3-none-any.whl → 30.0.1__py3-none-any.whl

lsst/daf/butler/formatters/parquet.py

@@ -270,18 +270,18 @@ def arrow_to_pandas(arrow_table: pa.Table) -> pd.DataFrame:
 
 
 def arrow_to_astropy(arrow_table: pa.Table) -> atable.Table:
-    """Convert a pyarrow table to an `astropy.Table`.
+    """Convert a pyarrow table to an `astropy.table.Table`.
 
     Parameters
     ----------
     arrow_table : `pyarrow.Table`
         Input arrow table to convert. If the table has astropy unit
         metadata in the schema it will be used in the construction
-        of the ``astropy.Table``.
+        of the ``astropy.table.Table``.
 
     Returns
     -------
-    table : `astropy.Table`
+    table : `astropy.table.Table`
         Converted astropy table.
     """
     from astropy.table import Table
@@ -520,7 +520,7 @@ def astropy_to_arrow(astropy_table: atable.Table) -> pa.Table:
 
     Parameters
     ----------
-    astropy_table : `astropy.Table`
+    astropy_table : `astropy.table.Table`
         Input astropy table.
 
     Returns
@@ -584,7 +584,7 @@ def astropy_to_pandas(astropy_table: atable.Table, index: str | None = None) ->
 
     Parameters
     ----------
-    astropy_table : `astropy.Table`
+    astropy_table : `astropy.table.Table`
         Input astropy table.
     index : `str`, optional
         Name of column to set as index.
@@ -640,7 +640,7 @@ def _astropy_to_numpy_dict(astropy_table: atable.Table) -> dict[str, np.ndarray]
 
     Parameters
     ----------
-    astropy_table : `astropy.Table`
+    astropy_table : `astropy.table.Table`
         Input astropy table.
 
     Returns

lsst/daf/butler/nonempty_mapping.py

@@ -43,7 +43,7 @@ _V = TypeVar("_V", bound=Copyable, covariant=True)
 
 
 class NonemptyMapping(Mapping[_K, _V]):
-    """A `Mapping` that implicitly adds values (like
+    """A `~collections.abc.Mapping` that implicitly adds values (like
     `~collections.defaultdict`) but treats any that evaluate to `False` as not
     present.
 

lsst/daf/butler/persistence_context.py

@@ -180,17 +180,20 @@ class PersistenceContextVars:
 
         Parameters
         ----------
-        function : `Callable`
+        function : `collections.abc.Callable`
             A callable which is to be executed inside a specific context.
         *args : tuple
-            Positional arguments which are to be passed to the `Callable`.
+            Positional arguments which are to be passed to the
+            `~collections.abc.Callable`.
         **kwargs : dict, optional
-            Extra key word arguments which are to be passed to the `Callable`.
+            Extra key word arguments which are to be passed to the
+            `~collections.abc.Callable`.
 
         Returns
         -------
-        result : `Any`
-            The result returned by executing the supplied `Callable`.
+        result : `typing.Any`
+            The result returned by executing the supplied
+            `~collections.abc.Callable`.
         """
         self._ctx = copy_context()
         # Type checkers seem to have trouble with a second layer nesting of

lsst/daf/butler/queries/_general_query_results.py

@@ -93,7 +93,7 @@ class GeneralQueryResults(QueryResultsBase):
 
         Yields
         ------
-        row_dict : `dict` [`str`, `Any`]
+        row_dict : `dict` [`str`, `typing.Any`]
             Result row as dictionary, the keys are the names of the dimensions,
             dimension fields (separated from dimension by dot) or dataset type
             fields (separated from dataset type name by dot).

lsst/daf/butler/queries/driver.py

@@ -245,7 +245,7 @@ class QueryDriver(AbstractContextManager[None]):
         ----------
         dimensions : `DimensionGroup`
             Dimensions of the data coordinates.
-        rows : `Iterable` [ `tuple` ]
+        rows : `~collections.abc.Iterable` [ `tuple` ]
             Tuples of data coordinate values, covering just the "required"
             subset of ``dimensions``.
 

lsst/daf/butler/queries/expression_factory.py

@@ -557,7 +557,7 @@ class ExpressionFactory:
         -------
         logical_and : `tree.Predicate`
             A boolean expression that evaluates to `True` only if all operands
-            evaluate to `True.
+            evaluate to `True`.
         """
         return first.logical_and(*args)
 
@@ -575,7 +575,7 @@ class ExpressionFactory:
         -------
         logical_or : `tree.Predicate`
             A boolean expression that evaluates to `True` if any operand
-            evaluates to `True.
+            evaluates to `True`.
         """
         return first.logical_or(*args)
 

lsst/daf/butler/queries/expressions/parser/exprTree.py

@@ -561,7 +561,7 @@ class PolygonNode(Node):
 
     Parameters
     ----------
-    vertices : `list`[`tuple`[`Node`, `Node`]]
+    vertices : `list` [`tuple` [`Node`, `Node`]]
         Node representing vertices of polygon.
     """
 

lsst/daf/butler/queries/expressions/parser/parserYacc.py

@@ -109,7 +109,7 @@ def _parseTimeString(time_str: str) -> astropy.time.Time:
     Returns
     -------
     time : `astropy.time.Time`
-       The parsed time.
+        The parsed time.
 
     Raises
     ------

lsst/daf/butler/queries/overlaps.py

@@ -69,9 +69,9 @@ class _NaiveDisjointSet(Generic[_T]):
 
         Parameters
         ----------
-        a :
+        a
             Element whose subset should be merged.
-        b :
+        b
             Element whose subset should be merged.
 
         Returns

lsst/daf/butler/queries/tree/_column_set.py

@@ -429,7 +429,7 @@ class ColumnOrder:
 
         Parameters
         ----------
-        row : `Sequence` [ `DataIdValue` ]
+        row : `~collections.abc.Sequence` [ `DataIdValue` ]
             A row output by the SQL query associated with these columns.
         """
         return row[: len(self._dimension_keys)]

lsst/daf/butler/registry/_collection_record_cache.py

@@ -135,7 +135,7 @@ class CollectionRecordCache:
 
         Parameters
         ----------
-        key : `Any`
+        key : `typing.Any`
             Collection key.
 
         Returns

lsst/daf/butler/registry/_collection_summary_cache.py

@@ -54,7 +54,8 @@ class CollectionSummaryCache:
 
         Parameters
         ----------
-        summaries : `~collections.abc.Mapping` [`Any`, `CollectionSummary`]
+        summaries : `~collections.abc.Mapping` [`typing.Any`, \
+              `CollectionSummary`]
             Summary records indexed by collection key, records must include all
             dataset types.
         """
@@ -65,15 +66,15 @@ class CollectionSummaryCache:
 
         Parameters
         ----------
-        keys : `~collections.abc.Iterable` [`Any`]
+        keys : `~collections.abc.Iterable` [`typing.Any`]
             Sequence of collection keys.
 
         Returns
         -------
-        summaries : `dict` [`Any`, `CollectionSummary`]
+        summaries : `dict` [`typing.Any`, `CollectionSummary`]
             Dictionary of summaries indexed by collection keys, includes
             records found in the cache.
-        missing_keys : `set` [`Any`]
+        missing_keys : `set` [`typing.Any`]
             Collection keys that are not present in the cache.
         """
         found = {}

lsst/daf/butler/registry/_registry.py

@@ -437,6 +437,10 @@ class Registry(ABC):
             Name of the type to be removed or tuple containing a list of type
             names to be removed. Wildcards are allowed.
 
+        Returns
+        -------
+        None
+
         Raises
         ------
         lsst.daf.butler.registry.OrphanedRecordError

lsst/daf/butler/registry/databases/postgresql.py

@@ -92,7 +92,8 @@ class PostgresqlDatabase(Database):
         allow_temporary_tables: bool = True,
     ):
         with engine.connect() as connection:
-            # `Any` to make mypy ignore the line below, can't use type: ignore
+            # `typing.Any` to make mypy ignore the line below, can't
+            # use type: ignore
             dbapi: Any = connection.connection
             try:
                 dsn = dbapi.get_dsn_parameters()

lsst/daf/butler/registry/datasets/byDimensions/_dataset_type_cache.py

@@ -155,7 +155,7 @@ class DatasetTypeCache:
         dataset_type : `DatasetType` or `None`
             Cached dataset type, `None` is returned if the name is not in the
             cache.
-        extra : `Any` or `None`
+        extra : `typing.Any` or `None`
             Cached opaque data, `None` is returned if the name is not in the
             cache.
         """

lsst/daf/butler/registry/datasets/byDimensions/_manager.py

@@ -822,8 +822,10 @@ class ByDimensionsDatasetRecordStorageManagerUUID(DatasetRecordStorageManager):
 
         Parameters
         ----------
-        storage : `_DatasetREcordStorage`
-            Struct that holds the tables and ID for a dataset type.
+        dimensions : `DimensionGroup`
+            Dimensions to validate.
+        tags : `sqlalchemy.schema.Table`
+            ???
         tmp_tags : `sqlalchemy.schema.Table`
             Temporary table with new datasets and the same schema as tags
             table.

lsst/daf/butler/registry/datasets/byDimensions/summaries.py

@@ -304,13 +304,14 @@ class CollectionSummaryManager:
         dataset_type_names : `~collections.abc.Iterable` [`str`]
             Names of dataset types to include into returned summaries. If
             `None` then all dataset types will be included.
-        dataset_type_factory : `Callable`
+        dataset_type_factory : `~collections.abc.Callable`
             Method that takes a table row and make `DatasetType` instance out
             of it.
 
         Returns
         -------
-        summaries : `~collections.abc.Mapping` [`Any`, `CollectionSummary`]
+        summaries : `~collections.abc.Mapping` [`typing.Any`, \
+              `CollectionSummary`]
             Collection summaries indexed by collection record key. This mapping
             will also contain all nested non-chained collections of the chained
             collections.

lsst/daf/butler/registry/interfaces/_datasets.py

@@ -378,7 +378,8 @@ class DatasetRecordStorageManager(VersionedExtension):
 
         Returns
         -------
-        summaries : `~collections.abc.Mapping` [`Any`, `CollectionSummary`]
+        summaries : `~collections.abc.Mapping` [`typing.Any`, \
+              `CollectionSummary`]
             Collection summaries indexed by collection record key. This mapping
             will also contain all nested non-chained collections of the chained
             collections.

lsst/daf/butler/registry/interfaces/_obscore.py

@@ -115,7 +115,7 @@ class ObsCoreTableManager(VersionedExtension):
             implemented with this manager.
         universe : `DimensionUniverse`
             All dimensions known to the registry.
-        config : `dict` [ `str`, `Any` ]
+        config : `dict` [ `str`, `typing.Any` ]
             Configuration of the obscore manager.
         datasets : `type`
             Type of dataset manager.

lsst/daf/butler/registry/obscore/_records.py

@@ -256,7 +256,7 @@ class RecordFactory:
 
         Returns
         -------
-        record : `dict` [ `str`, `Any` ] or `None`
+        record : `dict` [ `str`, `typing.Any` ] or `None`
             ObsCore record represented as a dictionary. `None` is returned if
             dataset does not need to be stored in the obscore table, e.g. when
             dataset type is not in obscore configuration.

lsst/daf/butler/registry/obscore/_spatial.py

@@ -72,7 +72,7 @@ class SpatialObsCorePlugin(ABC):
         name : `str`
             Arbitrary name given to this plugin (usually key in
             configuration).
-        config : `dict` [ `str`, `Any` ]
+        config : `dict` [ `str`, `typing.Any` ]
             Plugin configuration dictionary.
         db : `Database`, optional
             Interface to the underlying database engine and namespace. In some
@@ -120,7 +120,7 @@ class SpatialObsCorePlugin(ABC):
 
         Returns
         -------
-        record : `dict` [ `str`, `Any` ] or `None`
+        record : `dict` [ `str`, `typing.Any` ] or `None`
             Data to store in the main obscore table with column values
             corresponding to a region or `None` if there is nothing to store.
 

lsst/daf/butler/registry/queries/_results.py

@@ -319,7 +319,7 @@ class DataCoordinateQueryResults(QueryResultsBase, DataCoordinateIterable):
         datasetType : `DatasetType` or `str`
             Dataset type or the name of one to search for.  Must have
             dimensions that are a subset of ``self.graph``.
-        collections : `Any`
+        collections : `typing.Any`
             An expression that fully or partially identifies the collections
             to search for the dataset, such as a `str`, `re.Pattern`, or
             iterable  thereof.  ``...`` can be used to return all collections.
@@ -368,7 +368,7 @@ class DataCoordinateQueryResults(QueryResultsBase, DataCoordinateIterable):
         datasetType : `DatasetType` or `str`
             Dataset type or the name of one to search for.  Must have
             dimensions that are a subset of ``self.graph``.
-        collections : `Any`
+        collections : `typing.Any`
             An expression that fully or partially identifies the collections
             to search for the dataset, such as a `str`, `re.Pattern`, or
             iterable  thereof.  ``...`` can be used to return all collections.

lsst/daf/butler/registry/sql_registry.py

@@ -1375,7 +1375,7 @@ class SqlRegistry:
             records = {}
         else:
             records = dict(records)
-        if isinstance(dataId, DataCoordinate) and dataId.hasRecords():
+        if isinstance(dataId, DataCoordinate) and dataId.hasRecords() and not kwargs:
             for element_name in dataId.dimensions.elements:
                 records[element_name] = dataId.records[element_name]
         keys: dict[str, str | int] = dict(standardized.mapping)

lsst/daf/butler/registry/wildcards.py

@@ -97,14 +97,14 @@ class CategorizedWildcard:
         coerceUnrecognized : `~collections.abc.Callable`, optional
             A callback that takes a single argument of arbitrary type and
             returns either a `str` - appended to `strings` - or a `tuple` of
-            (`str`, `Any`) to be appended to `items`.  This will be called on
-            objects of unrecognized type. Exceptions will be reraised as
-            `TypeError` (and chained).
+            (`str`, `typing.Any`) to be appended to `items`.  This will be
+            called on objects of unrecognized type. Exceptions will be reraised
+            as `TypeError` (and chained).
         coerceItemValue : `~collections.abc.Callable`, optional
             If provided, ``expression`` may be a mapping from `str` to any
             type that can be passed to this function; the result of that call
             will be stored instead as the value in ``self.items``.
-        defaultItemValue : `Any`, optional
+        defaultItemValue : `typing.Any`, optional
             If provided, combine this value with any string values encountered
             (including any returned by ``coerceUnrecognized``) to form a
             `tuple` and add it to `items`, guaranteeing that `strings` will be
@@ -267,7 +267,7 @@ class CategorizedWildcard:
 
     items: list[tuple[str, Any]]
     """Two-item tuples that relate string values to other objects
-    (`list` [ `tuple` [ `str`, `Any` ] ]).
+    (`list` [ `tuple` [ `str`, `typing.Any` ] ]).
     """
 
 

lsst/daf/butler/remote_butler/_get.py

@@ -39,7 +39,7 @@ def get_dataset_as_python_object(
     auth : `RemoteButlerAuthenticationProvider`
         Provides authentication headers for HTTP service hosting the artifact
         files.
-    parameters : `Mapping`[`str`, `typing.Any`]
+    parameters : `~collections.abc.Mapping` [`str`, `typing.Any`]
         `StorageClass` and `Formatter` parameters to be used when converting
         the artifact to a Python object.
     cache_manager : `AbstractDatastoreCacheManager` or `None`, optional

lsst/daf/butler/remote_butler/_remote_butler.py

@@ -604,6 +604,7 @@ class RemoteButler(Butler):  # numpydoc ignore=PR02
         *,
         transfer_dimensions: bool = False,
         dry_run: bool = False,
+        skip_existing: bool = False,
     ) -> None:
         # Docstring inherited.
         raise NotImplementedError()

lsst/daf/butler/remote_butler/_remote_file_transfer_source.py

@@ -25,6 +25,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import annotations
+
+__all__ = ["RemoteFileTransferSource"]
+
 from collections.abc import Callable, Iterable, Iterator
 from contextlib import contextmanager
 from typing import Any, cast

lsst/daf/butler/remote_butler/authentication/cadc.py

@@ -89,12 +89,13 @@ def _get_authentication_token_from_environment(server_url: str) -> str | None:
 
     Parameters
     ----------
-        server_url (str): The URL of the server for which an authentication
-            token is being retrieved.
+    server_url : The URL of the server for which an authentication
+        token is being retrieved.
 
     Returns
     -------
-        str | None: The authentication token if available and hostname matches
+    str | None
+        The authentication token if available and hostname matches
         the whitelist; otherwise, None.
     """
     hostname = urlparse(server_url.lower()).hostname

lsst/daf/butler/script/_pruneDatasets.py

@@ -26,6 +26,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from __future__ import annotations
 
+__all__ = ["pruneDatasets"]
+
 import itertools
 from collections.abc import Callable, Iterable
 from enum import Enum, auto
@@ -57,11 +59,11 @@ class PruneDatasetsResult:
 
     Attributes
     ----------
-    tables
+    tables : `list` [`astropy.table.Table`]
         Same as in Parameters.
     state : ``PruneDatasetsResult.State``
         The current state of the action.
-    onConfirmation : `Callable[None, None]`
+    onConfirmation : `~collections.abc.Callable` [`None`, `None`]`
         The function to call to perform the action if the caller wants to
         confirm the tables before performing the action.
     """

lsst/daf/butler/script/configValidate.py

@@ -40,9 +40,9 @@ def configValidate(repo: str, quiet: bool, dataset_type: list[str], ignore: list
         URI to the location to create the repo.
     quiet : `bool`
         Do not report individual failures if True.
-    dataset_type : `list`[`str`]
+    dataset_type : `list` [`str`]
         Specific DatasetTypes to validate.
-    ignore : `list`[`str`]
+    ignore : `list` [`str`]
         DatasetTypes to ignore for validation.
 
     Returns

lsst/daf/butler/script/queryCollections.py

@@ -43,13 +43,13 @@ def _parseDatasetTypes(dataset_types: frozenset[str] | list[str] | None) -> list
 
     Parameters
     ----------
-    dataset_types : `frozenset`[`str`] | `list`[`str`] | `None`
+    dataset_types : `frozenset` [`str`] | `list` [`str`] | `None`
         The dataset types to parse. If `None`, an empty list is returned.
         If a `frozenset` or `list` is provided, it is returned as a list.
 
     Returns
     -------
-    dataset_types : `list`[`str`]
+    dataset_types : `list` [`str`]
         The parsed dataset types.
     """
     return [""] if not dataset_types else list(dataset_types)

lsst/daf/butler/script/removeCollections.py

@@ -26,6 +26,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from __future__ import annotations
 
+__all__ = ["removeCollections"]
+
 from collections.abc import Callable
 from dataclasses import dataclass
 from functools import partial

lsst/daf/butler/script/removeRuns.py

@@ -26,6 +26,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from __future__ import annotations
 
+__all__ = ["removeRuns"]
+
 from collections import defaultdict
 from collections.abc import Callable, Mapping, Sequence
 from dataclasses import dataclass

lsst/daf/butler/tests/cliCmdTestBase.py

@@ -26,6 +26,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from __future__ import annotations
 
+__all__ = ["CliCmdTestBase"]
+
 import abc
 import copy
 import os

lsst/daf/butler/tests/cliLogTestBase.py

@@ -35,6 +35,8 @@ lsst.log, and only uses it if it has been setup by another package.
 
 from __future__ import annotations
 
+__all__ = ["CliLogTestBase"]
+
 import logging
 import os
 import re

lsst/daf/butler/tests/hybrid_butler.py

@@ -284,10 +284,15 @@ class HybridButler(Butler):
         *,
         transfer_dimensions: bool = False,
         dry_run: bool = False,
+        skip_existing: bool = False,
     ) -> None:
         # Docstring inherited.
         return self._direct_butler.ingest_zip(
-            zip_file, transfer=transfer, transfer_dimensions=transfer_dimensions, dry_run=dry_run
+            zip_file,
+            transfer=transfer,
+            transfer_dimensions=transfer_dimensions,
+            dry_run=dry_run,
+            skip_existing=skip_existing,
         )
 
     def ingest(

lsst/daf/butler/tests/registry_data/spatial.py

@@ -44,6 +44,8 @@ in the future.
 
 from __future__ import annotations
 
+__all__ = []
+
 import argparse
 import os.path
 from collections.abc import Callable, Iterable, Iterator
@@ -526,7 +528,7 @@ def plot_pixels(
         Pixelization that interprets ``indices``.
     wcs : `WCS`
         Tangent plane to project spherical polygons onto.
-    indices : `Iterable` [ `int` ]
+    indices : `~collections.abc.Iterable` [ `int` ]
         Pixel indices to plot.
     *callbacks
         Callbacks to call for each pixel, passing the pixel index, the
@@ -555,7 +557,7 @@ def plot_hull(
         Pixelization that interprets ``indices``.
     wcs : `WCS`
         Tangent plane to project spherical polygons onto.
-    indices : `Iterable` [ `int` ]
+    indices : `~collections.abc.Iterable` [ `int` ]
         Pixel indices to plot.
     *callbacks
         Callbacks to call passing the list of pixel indices, the

lsst/daf/butler/tests/utils.py

@@ -432,7 +432,7 @@ def mock_env(new_environment: dict[str, str]) -> Iterator[None]:
 
     Parameters
     ----------
-    new_environment : `dict`[`str`, `str`]
+    new_environment : `dict` [`str`, `str`]
         New environment variable values.
     """
     with patch.dict(os.environ, new_environment, clear=True):

lsst/daf/butler/timespan_database_representation.py

@@ -188,13 +188,13 @@ class TimespanDatabaseRepresentation(ABC):
         name : `str`, optional
             Name for the logical column; a part of the name for multi-column
             representations.  Defaults to ``cls.NAME``.
-        result : `dict` [ `str`, `Any` ], optional
+        result : `dict` [ `str`, `typing.Any` ], optional
             A dictionary representing a database row that fields should be
             added to, or `None` to create and return a new one.
 
         Returns
         -------
-        result : `dict` [ `str`, `Any` ]
+        result : `dict` [ `str`, `typing.Any` ]
             A dictionary containing this representation of a timespan.  Exactly
             the `dict` passed as ``result`` if that is not `None`.
         """
@@ -207,7 +207,7 @@ class TimespanDatabaseRepresentation(ABC):
 
         Parameters
         ----------
-        mapping : `~collections.abc.Mapping` [ `Any`, `Any` ]
+        mapping : `~collections.abc.Mapping` [ `typing.Any`, `typing.Any` ]
             A dictionary representing a database row containing a `Timespan`
             in this representation.  Should have key(s) equal to the return
             value of `getFieldNames`.

lsst/daf/butler/version.py

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

{lsst_daf_butler-30.0.0rc3.dist-info → lsst_daf_butler-30.0.1.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: lsst-daf-butler
-Version: 30.0.0rc3
+Version: 30.0.1
 Summary: An abstraction layer for reading and writing astronomical data to datastores.
 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/daf_butler
+Project-URL: Source, https://github.com/lsst/daf_butler
 Keywords: lsst
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
@@ -42,7 +43,7 @@ Provides-Extra: test
 Requires-Dist: pytest>=3.2; extra == "test"
 Requires-Dist: numpy>=1.17; extra == "test"
 Requires-Dist: matplotlib>=3.0.3; extra == "test"
-Requires-Dist: pandas>=1.0; extra == "test"
+Requires-Dist: pandas<3.0,>=1.0; extra == "test"
 Provides-Extra: s3
 Requires-Dist: lsst-resources[s3]; extra == "s3"
 Provides-Extra: https