Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some typing #190

Merged
merged 2 commits into from
Nov 15, 2022
Merged

Some typing #190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
100a192
Some typing
dcherian Nov 15, 2022
efb8416
fixes.
dcherian Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions flox/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def offset_labels(labels: np.ndarray, ngroups: int) -> tuple[np.ndarray, int]:
def factorize_(
by: tuple,
axis: T_AxesOpt,
expected_groups: tuple[pd.Index, ...] = None,
expected_groups: tuple[pd.Index, ...] | None = None,
reindex: bool = False,
sort=True,
fastpath=False,
Expand Down Expand Up @@ -873,7 +873,7 @@ def _simple_combine(
return results


def _conc2(x_chunk, key1, key2=slice(None), axis: T_Axes = None) -> np.ndarray:
def _conc2(x_chunk, key1, key2=slice(None), axis: T_Axes | None = None) -> np.ndarray:
"""copied from dask.array.reductions.mean_combine"""
from dask.array.core import _concatenate2
from dask.utils import deepmap
Expand Down Expand Up @@ -1071,7 +1071,7 @@ def _reduce_blockwise(
return result


def _normalize_indexes(array, flatblocks, blkshape):
def _normalize_indexes(array: DaskArray, flatblocks, blkshape) -> tuple:
"""
.blocks accessor can only accept one iterable at a time,
but can handle multiple slices.
Expand All @@ -1083,7 +1083,7 @@ def _normalize_indexes(array, flatblocks, blkshape):
"""
unraveled = np.unravel_index(flatblocks, blkshape)

normalized: list[Union[int, np.ndarray, slice]] = []
normalized: list[Union[int, slice, list[int]]] = []
for ax, idx in enumerate(unraveled):
i = _unique(idx).squeeze()
if i.ndim == 0:
Expand Down Expand Up @@ -1397,7 +1397,7 @@ def dask_groupby_agg(
return (result, groups)


def _collapse_blocks_along_axes(reduced, axis, group_chunks):
def _collapse_blocks_along_axes(reduced: DaskArray, axis: T_Axes, group_chunks) -> DaskArray:
import dask.array
from dask.highlevelgraph import HighLevelGraph

Expand Down