solved some docs build problems

bluesky · Apr 9, 2024 · a9f4320 · a9f4320
1 parent bfa73ed
commit a9f4320
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 71 deletions.
diff --git a/tiled/adapters/array.py b/tiled/adapters/array.py
@@ -1,4 +1,4 @@
-from typing import Any, Optional, Tuple, Union
+from typing import Any, List, Optional, Tuple, Union
 
 import dask.array
 from numpy import dtype, ndarray
@@ -33,7 +33,7 @@ def __init__(
         structure: ArrayStructure,
         *,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
     ) -> None:
         """
@@ -60,7 +60,7 @@ def from_array(
         chunks: Optional[Tuple[Tuple[int, ...], ...]] = None,
         dims: Optional[Tuple[str, ...]] = None,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
     ) -> "ArrayAdapter":
         """

diff --git a/tiled/adapters/awkward.py b/tiled/adapters/awkward.py
@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 import awkward
 import awkward.forms
@@ -19,7 +19,7 @@ def __init__(
         container: DirectoryContainer,
         structure: AwkwardStructure,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[DummyAccessPolicy, SimpleAccessPolicy]] = None,
     ) -> None:
         """
@@ -43,7 +43,7 @@ def from_array(
         cls,
         array: NDArray[Any],
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[DummyAccessPolicy, SimpleAccessPolicy]] = None,
     ) -> "AwkwardAdapter":
         """
@@ -78,7 +78,7 @@ def metadata(self) -> JSON:
         """
         return self._metadata
 
-    def read_buffers(self, form_keys: Optional[list[str]] = None) -> dict[str, Any]:
+    def read_buffers(self, form_keys: Optional[List[str]] = None) -> Dict[str, Any]:
         """
 
         Parameters
@@ -101,7 +101,7 @@ def read_buffers(self, form_keys: Optional[list[str]] = None) -> dict[str, Any]:
             buffers[key] = self.container[key]
         return buffers
 
-    def read(self) -> dict[str, Any]:
+    def read(self) -> Dict[str, Any]:
         """
 
         Returns

diff --git a/tiled/adapters/awkward_buffers.py b/tiled/adapters/awkward_buffers.py
@@ -121,7 +121,7 @@ def from_directory(
         data_uri: str,
         structure: AwkwardStructure,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[DummyAccessPolicy, SimpleAccessPolicy]] = None,
     ) -> "AwkwardBuffersAdapter":
         """

diff --git a/tiled/adapters/csv.py b/tiled/adapters/csv.py
@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Callable, Iterator, List, Optional, Tuple, Union
+from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
 
 import dask.dataframe
 import pandas
@@ -28,7 +28,7 @@ def read_csv(
     data_uri: str,
     structure: Optional[TableStructure] = None,
     metadata: Optional[JSON] = None,
-    specs: Optional[list[Spec]] = None,
+    specs: Optional[List[Spec]] = None,
     access_policy: Optional[Union[DummyAccessPolicy, SimpleAccessPolicy]] = None,
     **kwargs: Any,
 ) -> TableAdapter:
@@ -81,10 +81,10 @@ class CSVAdapter:
 
     def __init__(
         self,
-        data_uris: Union[str, list[str]],
+        data_uris: Union[str, List[str]],
         structure: Optional[TableStructure] = None,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[DummyAccessPolicy, SimpleAccessPolicy]] = None,
     ) -> None:
         """
@@ -211,7 +211,7 @@ def write(self, data: Union[dask.dataframe.DataFrame, pandas.DataFrame]) -> None
         uri = self._partition_paths[0]
         data.to_csv(uri, index=False)
 
-    def read(self, *args: Optional[list[str]], **kwargs: Any) -> pandas.DataFrame:
+    def read(self, *args: Optional[List[str]], **kwargs: Any) -> pandas.DataFrame:
         """
 
         Parameters
@@ -266,7 +266,7 @@ def get(self, key: str) -> Union[ArrayAdapter, None]:
     def generate_data_sources(
         self,
         mimetype: Any,
-        dict_or_none: Callable[[TableStructure], dict[str, str]],
+        dict_or_none: Callable[[TableStructure], Dict[str, str]],
         item: Union[str, Path],
         is_directory: bool,
     ) -> List[DataSource]:
@@ -307,7 +307,7 @@ def from_single_file(
         data_uri: str,
         structure: Optional[TableStructure] = None,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[DummyAccessPolicy, SimpleAccessPolicy]] = None,
     ) -> "CSVAdapter":
         """

diff --git a/tiled/adapters/hdf5.py b/tiled/adapters/hdf5.py
@@ -2,7 +2,7 @@
 import os
 import warnings
 from pathlib import Path
-from typing import Any, Iterator, Optional, Union
+from typing import Any, Iterator, List, Optional, Tuple, Union
 
 import h5py
 import numpy
@@ -75,7 +75,7 @@ def __init__(
         *,
         structure: Optional[NodeStructure] = None,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
     ) -> None:
         """
@@ -103,7 +103,7 @@ def from_file(
         metadata: Optional[JSON] = None,
         swmr: bool = SWMR_DEFAULT,
         libver: str = "latest",
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
     ) -> "HDF5Adapter":
         """
@@ -127,7 +127,7 @@ def from_file(
     @classmethod
     def from_uri(
         cls,
-        data_uri: Union[str, list[str]],
+        data_uri: Union[str, List[str]],
         *,
         structure: Optional[NodeStructure] = None,
         metadata: Optional[JSON] = None,
@@ -314,7 +314,7 @@ def read(self, fields: Optional[str] = None) -> "HDF5Adapter":
 
     # The following two methods are used by keys(), values(), items().
 
-    def _keys_slice(self, start: int, stop: int, direction: int) -> list[Any]:
+    def _keys_slice(self, start: int, stop: int, direction: int) -> List[Any]:
         """
 
         Parameters
@@ -334,7 +334,7 @@ def _keys_slice(self, start: int, stop: int, direction: int) -> list[Any]:
 
     def _items_slice(
         self, start: int, stop: int, direction: int
-    ) -> list[tuple[Any, Any]]:
+    ) -> List[Tuple[Any, Any]]:
         """
 
         Parameters
@@ -367,15 +367,15 @@ def inlined_contents_enabled(self, depth: int) -> bool:
 
 
 def hdf5_lookup(
-    data_uri: Union[str, list[str]],
+    data_uri: Union[str, List[str]],
     *,
     structure: Optional[NodeStructure] = None,
     metadata: Optional[JSON] = None,
     swmr: bool = SWMR_DEFAULT,
     libver: str = "latest",
-    specs: Optional[list[Spec]] = None,
+    specs: Optional[List[Spec]] = None,
     access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
-    path: Optional[Union[list[Path], list[str]]] = None,
+    path: Optional[Union[List[Path], List[str]]] = None,
 ) -> Union[HDF5Adapter, ArrayAdapter]:
     """
 

diff --git a/tiled/adapters/mapping.py b/tiled/adapters/mapping.py
@@ -4,7 +4,7 @@
 import operator
 from collections import Counter
 from datetime import datetime, timedelta
-from typing import Any, Iterator, List, Optional, Tuple, Union, cast
+from typing import Any, Dict, Iterator, List, Optional, Tuple, Union, cast
 
 from fastapi import APIRouter
 
@@ -64,7 +64,7 @@ def __init__(
         structure: Optional[NodeStructure] = None,
         metadata: Optional[JSON] = None,
         sorting: Optional[List[SortingItem]] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
         entries_stale_after: Optional[timedelta] = None,
         metadata_stale_after: Optional[timedelta] = None,
@@ -99,7 +99,7 @@ def __init__(
             # This is a special case that means, "the given ordering".
             # By giving that a name ("_") we enable requests to asking for the
             # last N by requesting the sorting ("_", -1).
-            sorting = [SortingItem("_", 1)]
+            sorting = [SortingItem(key="_", direction=1)]
         self._sorting = sorting
         self._metadata = metadata or {}
         self.specs = specs or []
@@ -170,7 +170,7 @@ def metadata(self) -> JSON:
         return self._metadata
 
     @property
-    def sorting(self) -> list[SortingItem]:
+    def sorting(self) -> List[SortingItem]:
         """
 
         Returns
@@ -284,9 +284,9 @@ def entries_stale_at(self) -> Optional[datetime]:
     def new_variation(
         self,
         *args: Any,
-        mapping: Union[Sentinel, dict[str, Any]] = UNCHANGED,
+        mapping: Union[Sentinel, Dict[str, Any]] = UNCHANGED,
         metadata: Union[Sentinel, JSON] = UNCHANGED,
-        sorting: Union[Sentinel, list[SortingItem]] = UNCHANGED,
+        sorting: Union[Sentinel, List[SortingItem]] = UNCHANGED,
         must_revalidate: Union[Sentinel, bool] = UNCHANGED,
         **kwargs: Any,
     ) -> "MapAdapter":
@@ -361,7 +361,7 @@ def get_distinct(
         self,
         metadata: JSON,
         structure_families: StructureFamily,
-        specs: list[Spec],
+        specs: List[Spec],
         counts: int,
     ) -> dict[str, Any]:
         """
@@ -436,7 +436,7 @@ def sort(self, sorting: SortingItem) -> "MapAdapter":
 
     def _keys_slice(
         self, start: int, stop: int, direction: int
-    ) -> Union[Iterator[str], list[str]]:
+    ) -> Union[Iterator[str], List[str]]:
         """
 
         Parameters
@@ -523,7 +523,7 @@ def walk_string_values(tree: MapAdapter, node: Optional[Any] = None) -> Iterator
                     yield item
 
 
-def counter_to_dict(counter: dict[str, Any], counts: Any) -> list[dict[str, Any]]:
+def counter_to_dict(counter: Dict[str, Any], counts: Any) -> List[Dict[str, Any]]:
     """
 
     Parameters

diff --git a/tiled/adapters/netcdf.py b/tiled/adapters/netcdf.py
@@ -1,12 +1,12 @@
 from pathlib import Path
-from typing import Union
+from typing import List, Union
 
 import xarray
 
 from .xarray import DatasetAdapter
 
 
-def read_netcdf(filepath: Union[str, list[str], Path]) -> DatasetAdapter:
+def read_netcdf(filepath: Union[str, List[str], Path]) -> DatasetAdapter:
     """
 
     Parameters

diff --git a/tiled/adapters/parquet.py b/tiled/adapters/parquet.py
@@ -70,7 +70,7 @@ def dataframe_adapter(self) -> DataFrameAdapter:
 
     @classmethod
     def init_storage(
-        cls, data_uri: Union[str, list[str]], structure: TableStructure
+        cls, data_uri: Union[str, List[str]], structure: TableStructure
     ) -> Any:
         """
 

diff --git a/tiled/adapters/sparse.py b/tiled/adapters/sparse.py
@@ -1,4 +1,4 @@
-from typing import Any, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 import dask
 import numpy
@@ -25,7 +25,7 @@ def from_arrays(
         shape: Tuple[int, ...],
         dims: Optional[Tuple[str, ...]] = None,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
     ) -> "COOAdapter":
         """
@@ -66,7 +66,7 @@ def from_coo(
         *,
         dims: Optional[Tuple[str, ...]] = None,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
     ) -> "COOAdapter":
         """
@@ -96,13 +96,13 @@ def from_coo(
     @classmethod
     def from_global_ref(
         cls,
-        blocks: dict[Tuple[int, ...], Tuple[NDArray[Any], Any]],
+        blocks: Dict[Tuple[int, ...], Tuple[NDArray[Any], Any]],
         shape: Tuple[int, ...],
         chunks: Tuple[Tuple[int, ...], ...],
         *,
         dims: Optional[Tuple[str, ...]] = None,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
     ) -> "COOAdapter":
         """
@@ -145,11 +145,11 @@ def from_global_ref(
 
     def __init__(
         self,
-        blocks: dict[Tuple[int, ...], Tuple[NDArray[Any], Any]],
+        blocks: Dict[Tuple[int, ...], Tuple[NDArray[Any], Any]],
         structure: COOStructure,
         *,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
     ) -> None:
         """

diff --git a/tiled/adapters/sparse_blocks_parquet.py b/tiled/adapters/sparse_blocks_parquet.py
@@ -1,5 +1,5 @@
 import itertools
-from typing import Any, Optional, Tuple, Union
+from typing import Any, List, Optional, Tuple, Union
 
 import dask.base
 import dask.dataframe
@@ -16,7 +16,7 @@
 from .type_alliases import JSON
 
 
-def load_block(uri: str) -> Tuple[list[int], Tuple[NDArray[Any], Any]]:
+def load_block(uri: str) -> Tuple[List[int], Tuple[NDArray[Any], Any]]:
     """
 
     Parameters
@@ -42,10 +42,10 @@ class SparseBlocksParquetAdapter:
 
     def __init__(
         self,
-        data_uris: Union[str, list[str]],
+        data_uris: Union[str, List[str]],
         structure: COOStructure,
         metadata: Optional[JSON] = None,
-        specs: Optional[list[Spec]] = None,
+        specs: Optional[List[Spec]] = None,
         access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None,
     ) -> None:
         """
@@ -70,7 +70,7 @@ def __init__(
     @classmethod
     def init_storage(
         cls,
-        data_uri: Union[str, list[str]],
+        data_uri: Union[str, List[str]],
         structure: COOStructure,
     ) -> Any:
         """