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.

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

Apply and enforce more ruff rules #2053

Merged
merged 13 commits into from
Sep 24, 2024

Conversation

DimitriPapadopoulos
Copy link
Contributor

@DimitriPapadopoulos DimitriPapadopoulos commented Jul 23, 2024

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)

Copy link
Member

@jhamman jhamman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything here looks good @DimitriPapadopoulos.

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

src/zarr/store/core.py Outdated Show resolved Hide resolved
src/zarr/store/core.py Outdated Show resolved Hide resolved
@jhamman jhamman added the V3 Related to compatibility with V3 spec label Aug 9, 2024
@DimitriPapadopoulos DimitriPapadopoulos marked this pull request as draft August 10, 2024 07:43
@DimitriPapadopoulos DimitriPapadopoulos marked this pull request as ready for review August 10, 2024 08:20
@jhamman
Copy link
Member

jhamman commented Aug 22, 2024

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

@DimitriPapadopoulos
Copy link
Contributor Author

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

@DimitriPapadopoulos
Copy link
Contributor Author

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
Copy link
Contributor Author

Rebased.

@DimitriPapadopoulos
Copy link
Contributor Author

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
Copy link
Contributor Author

@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 jhamman merged commit 4cbb17e into zarr-developers:v3 Sep 24, 2024
26 checks passed
@jhamman
Copy link
Member

jhamman commented Sep 24, 2024

Thanks @DimitriPapadopoulos!

Comment on lines +1785 to +1787
chunks_accessed = [
".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@DimitriPapadopoulos DimitriPapadopoulos deleted the more_ruff branch September 25, 2024 05:30
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 27, 2024
* 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)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
V3 Related to compatibility with V3 spec
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants