diff --git a/doc/requirements.txt b/doc/requirements.txt index f1590e8a1..aec40cc1c 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,4 @@ -numpy>=1.19.5 +numpy>=1.21.3 sphinx==5.3.0 sphinx-argparse==0.3.2 sphinx-autodoc-typehints==1.19.5 diff --git a/euphonic/util.py b/euphonic/util.py index e15694012..f1d3d0aeb 100644 --- a/euphonic/util.py +++ b/euphonic/util.py @@ -1,4 +1,3 @@ -from collections import OrderedDict from functools import reduce from importlib.resources import files import itertools @@ -445,15 +444,14 @@ def _cell_vectors_to_volume(cell_vectors: Quantity) -> Quantity: def _get_unique_elems_and_idx( all_elems: Sequence[tuple[int | str, ...]] - ) -> 'OrderedDict[tuple[int | str, ...], np.ndarray]': + ) -> dict[tuple[int | str, ...], np.ndarray]: """ Returns an ordered dictionary mapping the unique sequences of elements to their indices """ - # Abuse OrderedDict to get ordered set - unique_elems = OrderedDict( - zip(all_elems, itertools.cycle([None]))).keys() - return OrderedDict(( + # Abuse dict keys to get an "ordered set" of elems for iteration + unique_elems = dict(zip(all_elems, itertools.cycle([None]))).keys() + return dict(( elem, np.asarray([i for i, other_elem in enumerate(all_elems) if elem == other_elem])