Apply and enforce more ruff rules #2053

DimitriPapadopoulos · 2024-07-23T13:24:01Z

Apply PERF401, but do not enforce for now - see Apply ruff/Perflint rule PERF401 pypa/setuptools#4449 (comment) and MAINT: start applying ruff/Perflint rules (PERF) numpy/numpy#26876 (comment) and make your own opinion 😄
Apply PT022. Do not enforce for now, I fear you won't like other PT rules.
~~Enforce TCH rules.~~
Enforce PGH rules.
Apply C405 and C417. Do not enforce for now, some C4 rules seem too strict.
Enforce PYI rules.
~~Fix pre-commit warnings and errors as they occur~~
~~Catch more precise exceptions than Exception~~

TODO:

Add unit tests and/or doctests in docstrings
Add docstrings and API docs for any new/modified user-facing classes and functions
New/modified features documented in docs/tutorial.rst
Changes documented in docs/release.rst
GitHub Actions have all passed
Test coverage is 100% (Codecov passes)

src/zarr/store/core.py

jhamman

Everything here looks good @DimitriPapadopoulos.

cc'ing @dstansby for a final review and look at the open mypy question

src/zarr/store/core.py

jhamman · 2024-08-22T23:30:35Z

@DimitriPapadopoulos - lots of merge conflicts here. Mind taking this one from the top?

DimitriPapadopoulos · 2024-08-23T08:26:48Z

It might be easier to restart from scratch. Let me have a look.

DimitriPapadopoulos · 2024-08-23T09:47:30Z

OK, I have re-applied all rules from scratch, leaving TCH out for now. A specific PR for TCH might be easier to review and merge faster, avoiding new conflicts.

DimitriPapadopoulos · 2024-09-02T13:13:08Z

Rebased.

DimitriPapadopoulos · 2024-09-24T05:26:37Z

Because other is an object, the other.store and other.path attributes might be anything — if they exist at all. Yet, according to the __eq__ documentation:

self.store == other.store is equivalent to self.store.__eq__(other.store) and self.store is a Store and Store.__eq__ returns bool.
self.path == other.path is equivalent to self.path.__eq__(other.path) and self.path is a str.

I ended up deciding this is a MyPy issue and ignoring no-any-return.

PERF102 When using only the keys of a dict use the `keys()` method

DimitriPapadopoulos · 2024-09-24T21:36:24Z

@jhamman This merge request seems ready for a review.

PERF401 Use an async list comprehension to create a transformed list

Ignore lint rules conflicting with the ruff formatter

PGH003 Use specific rule codes when ignoring type issues

PGH004 Use specific rule codes when using `noqa`

C417 Unnecessary `map` usage (rewrite using a generator expression)

PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`

PYI036 Returning Any from function

PYI041 Use `complex` instead of `float | complex` PYI041 Use `float` instead of `int | float`

PYI055 Multiple `type` members in a union. Combine them into one.

jhamman · 2024-09-24T22:09:59Z

Thanks @DimitriPapadopoulos!

jakirkham · 2024-09-24T22:34:51Z

tests/v3/test_indexing.py

+        chunks_accessed = [
+            ".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
+        ]


Maybe we can simplify this a bit further?

Suggested change

chunks_accessed = [

".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)

]

chunks_accessed = [

".".join(map(str, comb)) for comb in itertools.product(*chunks_per_dim)

]

Please see PR: #2229

* v3: (21 commits) Default zarr.open to open_group if shape is not provided (zarr-developers#2158) feat: metadata-only support for storage transformers metadata (zarr-developers#2180) fix(async): set default concurrency to 10 tasks (zarr-developers#2256) chore(deps): drop support for python 3.10 and numpy 1.24 (zarr-developers#2217) feature(store): add LoggingStore wrapper (zarr-developers#2231) Apply assorted ruff/flake8-simplify rules (SIM) (zarr-developers#2259) Add array storage helpers (zarr-developers#2065) Apply ruff/flake8-annotations rule ANN204 (zarr-developers#2258) No need to run DeepSource any more - we use ruff (zarr-developers#2261) Remove unnecessary lambda expression (zarr-developers#2260) Enforce ruff/flake8-comprehensions rules (C4) (zarr-developers#2239) Use `map(str, *)` in `test_accessed_chunks` (zarr-developers#2229) Replace Gitter with Zulip (zarr-developers#2254) Enforce ruff/flake8-pytest-style rules (PT) (zarr-developers#2236) Fix multiple identical imports (zarr-developers#2241) Enforce ruff/flake8-return rules (RET) (zarr-developers#2237) Enforce ruff/flynt rules (FLY) (zarr-developers#2240) Fix fill_value handling for complex dtypes (zarr-developers#2200) Update V2 codec pipeline to use concrete classes (zarr-developers#2244) Apply and enforce more ruff rules (zarr-developers#2053) ...

DimitriPapadopoulos force-pushed the more_ruff branch 7 times, most recently from 0f1d160 to aff1ee5 Compare July 23, 2024 15:11

DimitriPapadopoulos commented Jul 23, 2024

View reviewed changes

src/zarr/store/core.py Outdated Show resolved Hide resolved

DimitriPapadopoulos commented Jul 24, 2024

View reviewed changes

src/zarr/store/core.py Outdated Show resolved Hide resolved

jhamman approved these changes Aug 9, 2024

View reviewed changes

src/zarr/store/core.py Outdated Show resolved Hide resolved

src/zarr/store/core.py Outdated Show resolved Hide resolved

jhamman added the V3 label Aug 9, 2024

DimitriPapadopoulos force-pushed the more_ruff branch from aff1ee5 to 42657f3 Compare August 10, 2024 07:43

DimitriPapadopoulos marked this pull request as draft August 10, 2024 07:43

DimitriPapadopoulos force-pushed the more_ruff branch from 81fee09 to 4429df6 Compare August 10, 2024 08:05

DimitriPapadopoulos marked this pull request as ready for review August 10, 2024 08:20

DimitriPapadopoulos force-pushed the more_ruff branch 5 times, most recently from a01f1b7 to 4e919e2 Compare August 23, 2024 09:44

DimitriPapadopoulos force-pushed the more_ruff branch 4 times, most recently from f5524ee to 80618fb Compare September 2, 2024 13:09

DimitriPapadopoulos force-pushed the more_ruff branch 2 times, most recently from 254b32c to d26f5d3 Compare September 6, 2024 17:08

DimitriPapadopoulos force-pushed the more_ruff branch 4 times, most recently from 12e8393 to 05768ea Compare September 24, 2024 21:14

Apply ruff/Perflint rule PERF102

0f2ec3d

PERF102 When using only the keys of a dict use the `keys()` method

DimitriPapadopoulos force-pushed the more_ruff branch 3 times, most recently from df4d7e9 to 01d8480 Compare September 24, 2024 21:32

DimitriPapadopoulos force-pushed the more_ruff branch 2 times, most recently from d90ed39 to b5b002a Compare September 24, 2024 21:44

DimitriPapadopoulos added 12 commits September 24, 2024 23:52

Apply ruff/Perflint rule PERF401

c71c532

PERF401 Use an async list comprehension to create a transformed list

Apply ruff/flake8-pytest-style rule PT022

f462e1e

Fix pre-commit warning

47930c4

Ignore lint rules conflicting with the ruff formatter

Apply ruff/pygrep-hooks rule PGH003

26d17cb

PGH003 Use specific rule codes when ignoring type issues

Apply ruff/pygrep-hooks rule PGH004

9c13559

PGH004 Use specific rule codes when using `noqa`

Enforce ruff/pygrep-hooks rules (PGH)

8a14ef2

Apply ruff/flake8-comprehensions rule C417

3e9c081

C417 Unnecessary `map` usage (rewrite using a generator expression)

Apply ruff/flake8-pyi rule PYI032

58b88a1

PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`

Apply ruff/flake8-pyi rule PYI036

1881555

PYI036 Returning Any from function

Apply ruff/flake8-pyi rule PYI038

dbadd08

Apply ruff/flake8-pyi rule PYI041

85b7004

PYI041 Use `complex` instead of `float | complex` PYI041 Use `float` instead of `int | float`

Apply ruff/flake8-pyi rule PYI055

eba9d47

PYI055 Multiple `type` members in a union. Combine them into one.

DimitriPapadopoulos force-pushed the more_ruff branch from b5b002a to eba9d47 Compare September 24, 2024 21:54

jhamman merged commit 4cbb17e into zarr-developers:v3 Sep 24, 2024
26 checks passed

jakirkham reviewed Sep 24, 2024

View reviewed changes

DimitriPapadopoulos deleted the more_ruff branch September 25, 2024 05:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Apply and enforce more ruff rules #2053

Apply and enforce more ruff rules #2053

DimitriPapadopoulos commented Jul 23, 2024 •

edited

Loading

jhamman left a comment

jhamman commented Aug 22, 2024

DimitriPapadopoulos commented Aug 23, 2024

DimitriPapadopoulos commented Aug 23, 2024

DimitriPapadopoulos commented Sep 2, 2024

DimitriPapadopoulos commented Sep 24, 2024

DimitriPapadopoulos commented Sep 24, 2024

jhamman commented Sep 24, 2024

jakirkham Sep 24, 2024

Apply and enforce more ruff rules #2053

Apply and enforce more ruff rules #2053

Conversation

DimitriPapadopoulos commented Jul 23, 2024 • edited Loading

jhamman left a comment

Choose a reason for hiding this comment

jhamman commented Aug 22, 2024

DimitriPapadopoulos commented Aug 23, 2024

DimitriPapadopoulos commented Aug 23, 2024

DimitriPapadopoulos commented Sep 2, 2024

DimitriPapadopoulos commented Sep 24, 2024

DimitriPapadopoulos commented Sep 24, 2024

jhamman commented Sep 24, 2024

jakirkham Sep 24, 2024

Choose a reason for hiding this comment

DimitriPapadopoulos commented Jul 23, 2024 •

edited

Loading