Fix mypy errors in core.py #150

Illviljan · 2022-09-23T15:24:17Z

Closes Fix typing #96
Fix mypy errors in core.py
Activate mypy now that it passes

for more information, see https://pre-commit.ci

…core_typing

for more information, see https://pre-commit.ci

…core_typing

This reverts commit c08bc1c.

for more information, see https://pre-commit.ci

Illviljan · 2022-09-27T17:30:10Z

WOW, finally passing! :)

dcherian

👏🏾 👏🏾 👏🏾

dcherian · 2022-09-27T15:31:52Z

flox/core.py

        )
        groups = (results["groups"],)
        result = results[agg.name]

    else:
+        if TYPE_CHECKING:
+            assert isinstance(array, DaskArray)  # TODO: How else to narrow that .chunk is there?


agg should always have chunk defined? I don't understand your comment.

This code path is only if theere are dask arrays present, so adding the typecheck seems OK to me (but does it actually help?)

array is still np.array | dask.array at this point, mypy doesn't understand that has_dask implies that.

This isn't the daks arrays chunks property. It's chunk on Aggregation. It will exist regardless of array type.

See line 1636, there's the array.chunks.

I'll fix the typo in the TODO.

flox/core.py

for more information, see https://pre-commit.ci

…core_typing

for more information, see https://pre-commit.ci

Illviljan · 2022-10-05T16:31:29Z

What say you @dcherian, time to merge?

dcherian · 2022-10-06T17:57:42Z

Thanks @Illviljan massive effort!

* main: Update ci-additional.yaml (#167) Refactor before redoing cohorts (#164) Fix mypy errors in core.py (#150) Add link to numpy_groupies (#160) Bump codecov/codecov-action from 3.1.0 to 3.1.1 (#159) Use math.prod instead of np.prod (#157) Remove None output from _get_expected_groups (#152) Fix mypy errors in xarray.py, xrutils.py, cache.py (#144) Raise error if multiple by's are used with Ellipsis (#149) pre-commit autoupdate (#148) Add mypy ignores (#146) Get pre commit bot to update (#145) Remove duplicate examples headers (#147) Add ci additional (#143) Bump mamba-org/provision-with-micromamba from 12 to 13 (#141) Add ASV benchmark CI workflow (#139) Fix func count for dtype O with numpy and numba (#138)

* main: (29 commits) Major fix to subset_to_blocks (#173) Performance improvements for cohorts detection (#172) Remove split_out (#170) Deprecate resample_reduce (#169) More efficient cohorts. (#165) Allow specifying output dtype (#131) Add a dtype check for numpy arrays in assert_equal (#158) Update ci-additional.yaml (#167) Refactor before redoing cohorts (#164) Fix mypy errors in core.py (#150) Add link to numpy_groupies (#160) Bump codecov/codecov-action from 3.1.0 to 3.1.1 (#159) Use math.prod instead of np.prod (#157) Remove None output from _get_expected_groups (#152) Fix mypy errors in xarray.py, xrutils.py, cache.py (#144) Raise error if multiple by's are used with Ellipsis (#149) pre-commit autoupdate (#148) Add mypy ignores (#146) Get pre commit bot to update (#145) Remove duplicate examples headers (#147) ...

Illviljan and others added 30 commits September 23, 2022 17:23

Fix mypy errors

67a89ba

Turn on mypy ci

01154ee

[pre-commit.ci] auto fixes from pre-commit.com hooks

baae520

for more information, see https://pre-commit.ci

mostly type corrections

a538524

[pre-commit.ci] auto fixes from pre-commit.com hooks

0874e48

for more information, see https://pre-commit.ci

Update core.py

d1a611b

[pre-commit.ci] auto fixes from pre-commit.com hooks

1ead63d

for more information, see https://pre-commit.ci

Update core.py

b2fc2a8

Update core.py

9f10ff2

undo some changes

06ad423

[pre-commit.ci] auto fixes from pre-commit.com hooks

3118e7b

for more information, see https://pre-commit.ci

Update core.py

6170791

Update core.py

dfa2ad5

Merge branch 'core_typing' of https://github.com/Illviljan/flox into …

c94eea6

…core_typing

tuple to None

96fea1a

Please be this

018aec5

Ok! Now chunck_reduce

e8743ab

string is a sequence

b1f3f36

reduce len calcs

6e7ed3f

reindex_out is FAlse

33b6c3a

rename axis -> axis_

451ff57

[pre-commit.ci] auto fixes from pre-commit.com hooks

6603ccf

for more information, see https://pre-commit.ci

min_count can be None

cd087cd

more renaming

c926b54

Merge branch 'core_typing' of https://github.com/Illviljan/flox into …

0eb8ecd

…core_typing

Update core.py

3a09b4a

Update core.py

ba55c70

undo changes in _validate_reindex and allow returning None

71da838

Merge remote-tracking branch 'upstream/main' into core_typing

3a842c4

Tighten checks.

c08bc1c

Illviljan and others added 4 commits September 27, 2022 18:48

Revert "Tighten checks."

877bb22

This reverts commit c08bc1c.

dask_agg returns a tuple[np | dask] instead

3dbe7d8

[pre-commit.ci] auto fixes from pre-commit.com hooks

93d715d

for more information, see https://pre-commit.ci

Update core.py

512dcb1

Illviljan marked this pull request as ready for review September 27, 2022 17:30

This was referenced Sep 27, 2022

Fix mypy errors in core.py - groupby_reduce #153

Closed

Fix mypy errors in core.py - chunk_reduce #154

Closed

dcherian reviewed Sep 27, 2022

View reviewed changes

dcherian reviewed Sep 28, 2022

View reviewed changes

flox/core.py Outdated Show resolved Hide resolved

dcherian reviewed Sep 28, 2022

View reviewed changes

flox/core.py Outdated Show resolved Hide resolved

Illviljan mentioned this pull request Sep 28, 2022

Should _validate_reindex return booleans only? #155

Closed

Illviljan and others added 8 commits September 28, 2022 21:11

rename T_Axiss to T_Axes

2327746

Narrower type in find_group_cohorts

1a6cc09

[pre-commit.ci] auto fixes from pre-commit.com hooks

7a59977

for more information, see https://pre-commit.ci

Remove factorize comment

b51269b

use math.prod

b3ac6a6

Merge branch 'core_typing' of https://github.com/Illviljan/flox into …

436043b

…core_typing

fix typo in TODO comment

3755045

[pre-commit.ci] auto fixes from pre-commit.com hooks

83cdca9

for more information, see https://pre-commit.ci

Illviljan mentioned this pull request Sep 28, 2022

Use math.prod instead of np.prod #157

Merged

Illviljan and others added 3 commits September 28, 2022 23:13

Merge remote-tracking branch 'upstream/main' into core_typing

fd30b94

comments

d435c7a

[pre-commit.ci] auto fixes from pre-commit.com hooks

9e6e0f5

for more information, see https://pre-commit.ci

AxesOpt

3bc7d61

dcherian merged commit 91b6e19 into xarray-contrib:main Oct 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix mypy errors in core.py #150

Fix mypy errors in core.py #150

Illviljan commented Sep 23, 2022 •

edited

Loading

Illviljan commented Sep 27, 2022

dcherian left a comment

dcherian Sep 27, 2022

Illviljan Sep 28, 2022 •

edited

Loading

dcherian Sep 28, 2022

Illviljan Sep 28, 2022 •

edited

Loading

Illviljan commented Oct 5, 2022

dcherian commented Oct 6, 2022

Fix mypy errors in core.py #150

Fix mypy errors in core.py #150

Conversation

Illviljan commented Sep 23, 2022 • edited Loading

Illviljan commented Sep 27, 2022

dcherian left a comment

Choose a reason for hiding this comment

dcherian Sep 27, 2022

Choose a reason for hiding this comment

Illviljan Sep 28, 2022 • edited Loading

Choose a reason for hiding this comment

dcherian Sep 28, 2022

Choose a reason for hiding this comment

Illviljan Sep 28, 2022 • edited Loading

Choose a reason for hiding this comment

Illviljan commented Oct 5, 2022

dcherian commented Oct 6, 2022

Illviljan commented Sep 23, 2022 •

edited

Loading

Illviljan Sep 28, 2022 •

edited

Loading

Illviljan Sep 28, 2022 •

edited

Loading