Apply and enforce more ruff rules - #2053

Merged
jhamman merged 13 commits into
zarr-developers:v3from
DimitriPapadopoulos:more_ruff
Sep 24, 2024
Merged

Apply and enforce more ruff rules#2053
jhamman merged 13 commits into
zarr-developers:v3from
DimitriPapadopoulos:more_ruff

Conversation

@DimitriPapadopoulos

@DimitriPapadopoulosDimitriPapadopoulos commented Jul 23, 2024•
edited
Loading

Copy link
Copy Markdown
Contributor

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)

@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed the more_ruff branch 7 times, most recently from 0f1d160 to aff1ee5CompareJuly 23, 2024 15:11
DimitriPapadopoulos
DimitriPapadopoulos commented Jul 23, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py Outdated
DimitriPapadopoulos
DimitriPapadopoulos commented Jul 24, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py Outdated
jhamman
jhamman approved these changes Aug 9, 2024
View reviewed changes

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

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

Comment threadsrc/zarr/store/core.py Outdated
Comment threadsrc/zarr/store/core.py Outdated
@jhammanjhamman added the V3 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

jhamman commented Aug 22, 2024

Copy link
Copy Markdown
Member

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

@DimitriPapadopoulos

DimitriPapadopoulos commented Aug 23, 2024

Copy link
Copy Markdown
ContributorAuthor

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

@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed the more_ruff branch 5 times, most recently from a01f1b7 to 4e919e2CompareAugust 23, 2024 09:44
@DimitriPapadopoulos

DimitriPapadopoulos commented Aug 23, 2024

Copy link
Copy Markdown
ContributorAuthor

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
DimitriPapadopoulosforce-pushed the more_ruff branch 4 times, most recently from f5524ee to 80618fbCompareSeptember 2, 2024 13:09
@DimitriPapadopoulos

DimitriPapadopoulos commented Sep 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Rebased.

@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed the more_ruff branch 2 times, most recently from 254b32c to d26f5d3CompareSeptember 6, 2024 17:08
@DimitriPapadopoulos

DimitriPapadopoulos commented Sep 24, 2024

Copy link
Copy Markdown
ContributorAuthor

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.

@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed the more_ruff branch 4 times, most recently from 12e8393 to 05768eaCompareSeptember 24, 2024 21:14
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF102
0f2ec3d
PERF102 When using only the keys of a dict use the `keys()` method
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed the more_ruff branch 3 times, most recently from df4d7e9 to 01d8480CompareSeptember 24, 2024 21:32
@DimitriPapadopoulos

DimitriPapadopoulos commented Sep 24, 2024

Copy link
Copy Markdown
ContributorAuthor

@jhamman This merge request seems ready for a review.

@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed the more_ruff branch 2 times, most recently from d90ed39 to b5b002aCompareSeptember 24, 2024 21:44
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF401
c71c532
PERF401 Use an async list comprehension to create a transformed list
@DimitriPapadopoulos
Apply ruff/flake8-pytest-style rule PT022
f462e1e
@DimitriPapadopoulos
Fix pre-commit warning
47930c4
Ignore lint rules conflicting with the ruff formatter
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH003
26d17cb
PGH003 Use specific rule codes when ignoring type issues
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH004
9c13559
PGH004 Use specific rule codes when using `noqa`
@DimitriPapadopoulos
Enforce ruff/pygrep-hooks rules (PGH)
8a14ef2
@DimitriPapadopoulos
Apply ruff/flake8-comprehensions rule C417
3e9c081
C417 Unnecessary `map` usage (rewrite using a generator expression)
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI032
58b88a1
PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI036
1881555
PYI036 Returning Any from function
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI038
dbadd08
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI041
85b7004
PYI041 Use `complex` instead of `float | complex`
PYI041 Use `float` instead of `int | float`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI055
eba9d47
PYI055 Multiple `type` members in a union. Combine them into one.
@jhamman
jhamman merged commit 4cbb17e into zarr-developers:v3Sep 24, 2024
@jhamman

jhamman commented Sep 24, 2024

Copy link
Copy Markdown
Member

Thanks @DimitriPapadopoulos!

jakirkham
jakirkham reviewed Sep 24, 2024
View reviewed changes
Comment threadtests/v3/test_indexing.py
Comment on lines +1785 to +1787
chunks_accessed = [
".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
]

@jakirkhamjakirkhamSep 24, 2024

Copy link
Copy Markdown
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) forciincomb]) forcombinitertools.product(*chunks_per_dim)
]
chunks_accessed= [
".".join(map(str, comb)) forcombinitertools.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
@dcherian
Merge branch 'v3' into generalize-stateful-store
ae3bca5
* 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jakirkhamjakirkhamjakirkham left review comments
@jhammanjhammanjhamman approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@DimitriPapadopoulos@jhamman@jakirkham
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Apply and enforce more ruff rules - #2053
Merged
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Sep 24, 2024
Merged
Apply and enforce more ruff rules#2053
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Conversation
@DimitriPapadopoulos
@DimitriPapadopoulosDimitriPapadopoulos
commented
Jul 23, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
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)
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
7 times, most recently
from
0f1d160 to
aff1ee5CompareJuly 23, 2024 15:11
DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 23, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 24, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

jhamman
jhamman
approved these changes
Aug 9, 2024
View reviewed changes
@jhammanjhamman
left a comment


Copy link


Copy Markdown

Member
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
Comment threadsrc/zarr/store/core.py
Outdated

Comment threadsrc/zarr/store/core.py
Outdated

@jhammanjhamman
added
the 
V3

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
jhamman
commented
Aug 22, 2024

Copy link


Copy Markdown

Member
@DimitriPapadopoulos - lots of merge conflicts here. Mind taking this one from the top?
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
It might be easier to restart from scratch. Let me have a look.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
5 times, most recently
from
a01f1b7 to
4e919e2CompareAugust 23, 2024 09:44
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
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
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
f5524ee to
80618fbCompareSeptember 2, 2024 13:09
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 2, 2024

Copy link


Copy Markdown

ContributorAuthor
Rebased.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
254b32c to
d26f5d3CompareSeptember 6, 2024 17:08
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
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.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
12e8393 to
05768eaCompareSeptember 24, 2024 21:14
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF102
0f2ec3d
PERF102 When using only the keys of a dict use the `keys()` method
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
3 times, most recently
from
df4d7e9 to
01d8480CompareSeptember 24, 2024 21:32
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
@jhamman This merge request seems ready for a review.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
d90ed39 to
b5b002aCompareSeptember 24, 2024 21:44
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF401
c71c532
PERF401 Use an async list comprehension to create a transformed list
@DimitriPapadopoulos
Apply ruff/flake8-pytest-style rule PT022
f462e1e
@DimitriPapadopoulos
Fix pre-commit warning
47930c4
Ignore lint rules conflicting with the ruff formatter
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH003
26d17cb
PGH003 Use specific rule codes when ignoring type issues
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH004
9c13559
PGH004 Use specific rule codes when using `noqa`
@DimitriPapadopoulos
Enforce ruff/pygrep-hooks rules (PGH)
8a14ef2
@DimitriPapadopoulos
Apply ruff/flake8-comprehensions rule C417
3e9c081
C417 Unnecessary `map` usage (rewrite using a generator expression)
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI032
58b88a1
PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI036
1881555
PYI036 Returning Any from function
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI038
dbadd08
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI041
85b7004
PYI041 Use `complex` instead of `float | complex`
PYI041 Use `float` instead of `int | float`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI055
eba9d47
PYI055 Multiple `type` members in a union. Combine them into one.
@jhamman
jhamman
merged commit 4cbb17e
into
zarr-developers:v3Sep 24, 2024
@jhamman
jhamman
commented
Sep 24, 2024

Copy link


Copy Markdown

Member
Thanks @DimitriPapadopoulos!
jakirkham
jakirkham
reviewed
Sep 24, 2024
View reviewed changes
Comment threadtests/v3/test_indexing.py

Comment on lines

+1785
 to 
+1787

 chunks_accessed = [
 ".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
]
@jakirkhamjakirkhamSep 24, 2024

Copy link


Copy Markdown

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) forciincomb]) forcombinitertools.product(*chunks_per_dim)
 ]
chunks_accessed= [
".".join(map(str, comb)) forcombinitertools.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
@dcherian
Merge branch 'v3' into generalize-stateful-store
ae3bca5
* 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jakirkhamjakirkhamjakirkham left review comments
@jhammanjhammanjhamman approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@DimitriPapadopoulos@jhamman@jakirkham

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Apply and enforce more ruff rules - #2053
Merged
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Sep 24, 2024
Merged
Apply and enforce more ruff rules#2053
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Conversation
@DimitriPapadopoulos
@DimitriPapadopoulosDimitriPapadopoulos
commented
Jul 23, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
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)
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
7 times, most recently
from
0f1d160 to
aff1ee5CompareJuly 23, 2024 15:11
DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 23, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 24, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

jhamman
jhamman
approved these changes
Aug 9, 2024
View reviewed changes
@jhammanjhamman
left a comment


Copy link


Copy Markdown

Member
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
Comment threadsrc/zarr/store/core.py
Outdated

Comment threadsrc/zarr/store/core.py
Outdated

@jhammanjhamman
added
the 
V3

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
jhamman
commented
Aug 22, 2024

Copy link


Copy Markdown

Member
@DimitriPapadopoulos - lots of merge conflicts here. Mind taking this one from the top?
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
It might be easier to restart from scratch. Let me have a look.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
5 times, most recently
from
a01f1b7 to
4e919e2CompareAugust 23, 2024 09:44
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
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
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
f5524ee to
80618fbCompareSeptember 2, 2024 13:09
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 2, 2024

Copy link


Copy Markdown

ContributorAuthor
Rebased.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
254b32c to
d26f5d3CompareSeptember 6, 2024 17:08
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
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.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
12e8393 to
05768eaCompareSeptember 24, 2024 21:14
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF102
0f2ec3d
PERF102 When using only the keys of a dict use the `keys()` method
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
3 times, most recently
from
df4d7e9 to
01d8480CompareSeptember 24, 2024 21:32
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
@jhamman This merge request seems ready for a review.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
d90ed39 to
b5b002aCompareSeptember 24, 2024 21:44
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF401
c71c532
PERF401 Use an async list comprehension to create a transformed list
@DimitriPapadopoulos
Apply ruff/flake8-pytest-style rule PT022
f462e1e
@DimitriPapadopoulos
Fix pre-commit warning
47930c4
Ignore lint rules conflicting with the ruff formatter
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH003
26d17cb
PGH003 Use specific rule codes when ignoring type issues
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH004
9c13559
PGH004 Use specific rule codes when using `noqa`
@DimitriPapadopoulos
Enforce ruff/pygrep-hooks rules (PGH)
8a14ef2
@DimitriPapadopoulos
Apply ruff/flake8-comprehensions rule C417
3e9c081
C417 Unnecessary `map` usage (rewrite using a generator expression)
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI032
58b88a1
PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI036
1881555
PYI036 Returning Any from function
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI038
dbadd08
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI041
85b7004
PYI041 Use `complex` instead of `float | complex`
PYI041 Use `float` instead of `int | float`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI055
eba9d47
PYI055 Multiple `type` members in a union. Combine them into one.
@jhamman
jhamman
merged commit 4cbb17e
into
zarr-developers:v3Sep 24, 2024
@jhamman
jhamman
commented
Sep 24, 2024

Copy link


Copy Markdown

Member
Thanks @DimitriPapadopoulos!
jakirkham
jakirkham
reviewed
Sep 24, 2024
View reviewed changes
Comment threadtests/v3/test_indexing.py

Comment on lines

+1785
 to 
+1787

 chunks_accessed = [
 ".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
]
@jakirkhamjakirkhamSep 24, 2024

Copy link


Copy Markdown

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) forciincomb]) forcombinitertools.product(*chunks_per_dim)
 ]
chunks_accessed= [
".".join(map(str, comb)) forcombinitertools.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
@dcherian
Merge branch 'v3' into generalize-stateful-store
ae3bca5
* 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jakirkhamjakirkhamjakirkham left review comments
@jhammanjhammanjhamman approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@DimitriPapadopoulos@jhamman@jakirkham

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Apply and enforce more ruff rules - #2053
Merged
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Sep 24, 2024
Merged
Apply and enforce more ruff rules#2053
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Conversation
@DimitriPapadopoulos
@DimitriPapadopoulosDimitriPapadopoulos
commented
Jul 23, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
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)
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
7 times, most recently
from
0f1d160 to
aff1ee5CompareJuly 23, 2024 15:11
DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 23, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 24, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

jhamman
jhamman
approved these changes
Aug 9, 2024
View reviewed changes
@jhammanjhamman
left a comment


Copy link


Copy Markdown

Member
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
Comment threadsrc/zarr/store/core.py
Outdated

Comment threadsrc/zarr/store/core.py
Outdated

@jhammanjhamman
added
the 
V3

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
jhamman
commented
Aug 22, 2024

Copy link


Copy Markdown

Member
@DimitriPapadopoulos - lots of merge conflicts here. Mind taking this one from the top?
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
It might be easier to restart from scratch. Let me have a look.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
5 times, most recently
from
a01f1b7 to
4e919e2CompareAugust 23, 2024 09:44
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
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
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
f5524ee to
80618fbCompareSeptember 2, 2024 13:09
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 2, 2024

Copy link


Copy Markdown

ContributorAuthor
Rebased.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
254b32c to
d26f5d3CompareSeptember 6, 2024 17:08
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
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.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
12e8393 to
05768eaCompareSeptember 24, 2024 21:14
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF102
0f2ec3d
PERF102 When using only the keys of a dict use the `keys()` method
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
3 times, most recently
from
df4d7e9 to
01d8480CompareSeptember 24, 2024 21:32
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
@jhamman This merge request seems ready for a review.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
d90ed39 to
b5b002aCompareSeptember 24, 2024 21:44
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF401
c71c532
PERF401 Use an async list comprehension to create a transformed list
@DimitriPapadopoulos
Apply ruff/flake8-pytest-style rule PT022
f462e1e
@DimitriPapadopoulos
Fix pre-commit warning
47930c4
Ignore lint rules conflicting with the ruff formatter
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH003
26d17cb
PGH003 Use specific rule codes when ignoring type issues
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH004
9c13559
PGH004 Use specific rule codes when using `noqa`
@DimitriPapadopoulos
Enforce ruff/pygrep-hooks rules (PGH)
8a14ef2
@DimitriPapadopoulos
Apply ruff/flake8-comprehensions rule C417
3e9c081
C417 Unnecessary `map` usage (rewrite using a generator expression)
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI032
58b88a1
PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI036
1881555
PYI036 Returning Any from function
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI038
dbadd08
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI041
85b7004
PYI041 Use `complex` instead of `float | complex`
PYI041 Use `float` instead of `int | float`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI055
eba9d47
PYI055 Multiple `type` members in a union. Combine them into one.
@jhamman
jhamman
merged commit 4cbb17e
into
zarr-developers:v3Sep 24, 2024
@jhamman
jhamman
commented
Sep 24, 2024

Copy link


Copy Markdown

Member
Thanks @DimitriPapadopoulos!
jakirkham
jakirkham
reviewed
Sep 24, 2024
View reviewed changes
Comment threadtests/v3/test_indexing.py

Comment on lines

+1785
 to 
+1787

 chunks_accessed = [
 ".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
]
@jakirkhamjakirkhamSep 24, 2024

Copy link


Copy Markdown

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) forciincomb]) forcombinitertools.product(*chunks_per_dim)
 ]
chunks_accessed= [
".".join(map(str, comb)) forcombinitertools.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
@dcherian
Merge branch 'v3' into generalize-stateful-store
ae3bca5
* 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jakirkhamjakirkhamjakirkham left review comments
@jhammanjhammanjhamman approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@DimitriPapadopoulos@jhamman@jakirkham

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Apply and enforce more ruff rules - #2053
Merged
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Sep 24, 2024
Merged
Apply and enforce more ruff rules#2053
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Conversation
@DimitriPapadopoulos
@DimitriPapadopoulosDimitriPapadopoulos
commented
Jul 23, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
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)
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
7 times, most recently
from
0f1d160 to
aff1ee5CompareJuly 23, 2024 15:11
DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 23, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 24, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

jhamman
jhamman
approved these changes
Aug 9, 2024
View reviewed changes
@jhammanjhamman
left a comment


Copy link


Copy Markdown

Member
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
Comment threadsrc/zarr/store/core.py
Outdated

Comment threadsrc/zarr/store/core.py
Outdated

@jhammanjhamman
added
the 
V3

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
jhamman
commented
Aug 22, 2024

Copy link


Copy Markdown

Member
@DimitriPapadopoulos - lots of merge conflicts here. Mind taking this one from the top?
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
It might be easier to restart from scratch. Let me have a look.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
5 times, most recently
from
a01f1b7 to
4e919e2CompareAugust 23, 2024 09:44
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
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
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
f5524ee to
80618fbCompareSeptember 2, 2024 13:09
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 2, 2024

Copy link


Copy Markdown

ContributorAuthor
Rebased.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
254b32c to
d26f5d3CompareSeptember 6, 2024 17:08
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
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.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
12e8393 to
05768eaCompareSeptember 24, 2024 21:14
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF102
0f2ec3d
PERF102 When using only the keys of a dict use the `keys()` method
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
3 times, most recently
from
df4d7e9 to
01d8480CompareSeptember 24, 2024 21:32
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
@jhamman This merge request seems ready for a review.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
d90ed39 to
b5b002aCompareSeptember 24, 2024 21:44
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF401
c71c532
PERF401 Use an async list comprehension to create a transformed list
@DimitriPapadopoulos
Apply ruff/flake8-pytest-style rule PT022
f462e1e
@DimitriPapadopoulos
Fix pre-commit warning
47930c4
Ignore lint rules conflicting with the ruff formatter
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH003
26d17cb
PGH003 Use specific rule codes when ignoring type issues
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH004
9c13559
PGH004 Use specific rule codes when using `noqa`
@DimitriPapadopoulos
Enforce ruff/pygrep-hooks rules (PGH)
8a14ef2
@DimitriPapadopoulos
Apply ruff/flake8-comprehensions rule C417
3e9c081
C417 Unnecessary `map` usage (rewrite using a generator expression)
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI032
58b88a1
PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI036
1881555
PYI036 Returning Any from function
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI038
dbadd08
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI041
85b7004
PYI041 Use `complex` instead of `float | complex`
PYI041 Use `float` instead of `int | float`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI055
eba9d47
PYI055 Multiple `type` members in a union. Combine them into one.
@jhamman
jhamman
merged commit 4cbb17e
into
zarr-developers:v3Sep 24, 2024
@jhamman
jhamman
commented
Sep 24, 2024

Copy link


Copy Markdown

Member
Thanks @DimitriPapadopoulos!
jakirkham
jakirkham
reviewed
Sep 24, 2024
View reviewed changes
Comment threadtests/v3/test_indexing.py

Comment on lines

+1785
 to 
+1787

 chunks_accessed = [
 ".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
]
@jakirkhamjakirkhamSep 24, 2024

Copy link


Copy Markdown

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) forciincomb]) forcombinitertools.product(*chunks_per_dim)
 ]
chunks_accessed= [
".".join(map(str, comb)) forcombinitertools.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
@dcherian
Merge branch 'v3' into generalize-stateful-store
ae3bca5
* 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jakirkhamjakirkhamjakirkham left review comments
@jhammanjhammanjhamman approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@DimitriPapadopoulos@jhamman@jakirkham

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Apply and enforce more ruff rules - #2053
Merged
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Sep 24, 2024
Merged
Apply and enforce more ruff rules#2053
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Conversation
@DimitriPapadopoulos
@DimitriPapadopoulosDimitriPapadopoulos
commented
Jul 23, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
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)
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
7 times, most recently
from
0f1d160 to
aff1ee5CompareJuly 23, 2024 15:11
DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 23, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 24, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

jhamman
jhamman
approved these changes
Aug 9, 2024
View reviewed changes
@jhammanjhamman
left a comment


Copy link


Copy Markdown

Member
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
Comment threadsrc/zarr/store/core.py
Outdated

Comment threadsrc/zarr/store/core.py
Outdated

@jhammanjhamman
added
the 
V3

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
jhamman
commented
Aug 22, 2024

Copy link


Copy Markdown

Member
@DimitriPapadopoulos - lots of merge conflicts here. Mind taking this one from the top?
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
It might be easier to restart from scratch. Let me have a look.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
5 times, most recently
from
a01f1b7 to
4e919e2CompareAugust 23, 2024 09:44
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
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
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
f5524ee to
80618fbCompareSeptember 2, 2024 13:09
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 2, 2024

Copy link


Copy Markdown

ContributorAuthor
Rebased.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
254b32c to
d26f5d3CompareSeptember 6, 2024 17:08
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
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.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
12e8393 to
05768eaCompareSeptember 24, 2024 21:14
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF102
0f2ec3d
PERF102 When using only the keys of a dict use the `keys()` method
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
3 times, most recently
from
df4d7e9 to
01d8480CompareSeptember 24, 2024 21:32
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
@jhamman This merge request seems ready for a review.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
d90ed39 to
b5b002aCompareSeptember 24, 2024 21:44
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF401
c71c532
PERF401 Use an async list comprehension to create a transformed list
@DimitriPapadopoulos
Apply ruff/flake8-pytest-style rule PT022
f462e1e
@DimitriPapadopoulos
Fix pre-commit warning
47930c4
Ignore lint rules conflicting with the ruff formatter
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH003
26d17cb
PGH003 Use specific rule codes when ignoring type issues
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH004
9c13559
PGH004 Use specific rule codes when using `noqa`
@DimitriPapadopoulos
Enforce ruff/pygrep-hooks rules (PGH)
8a14ef2
@DimitriPapadopoulos
Apply ruff/flake8-comprehensions rule C417
3e9c081
C417 Unnecessary `map` usage (rewrite using a generator expression)
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI032
58b88a1
PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI036
1881555
PYI036 Returning Any from function
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI038
dbadd08
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI041
85b7004
PYI041 Use `complex` instead of `float | complex`
PYI041 Use `float` instead of `int | float`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI055
eba9d47
PYI055 Multiple `type` members in a union. Combine them into one.
@jhamman
jhamman
merged commit 4cbb17e
into
zarr-developers:v3Sep 24, 2024
@jhamman
jhamman
commented
Sep 24, 2024

Copy link


Copy Markdown

Member
Thanks @DimitriPapadopoulos!
jakirkham
jakirkham
reviewed
Sep 24, 2024
View reviewed changes
Comment threadtests/v3/test_indexing.py

Comment on lines

+1785
 to 
+1787

 chunks_accessed = [
 ".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
]
@jakirkhamjakirkhamSep 24, 2024

Copy link


Copy Markdown

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) forciincomb]) forcombinitertools.product(*chunks_per_dim)
 ]
chunks_accessed= [
".".join(map(str, comb)) forcombinitertools.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
@dcherian
Merge branch 'v3' into generalize-stateful-store
ae3bca5
* 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jakirkhamjakirkhamjakirkham left review comments
@jhammanjhammanjhamman approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@DimitriPapadopoulos@jhamman@jakirkham

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Apply and enforce more ruff rules - #2053
Merged
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Sep 24, 2024
Merged
Apply and enforce more ruff rules#2053
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Conversation
@DimitriPapadopoulos
@DimitriPapadopoulosDimitriPapadopoulos
commented
Jul 23, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
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)
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
7 times, most recently
from
0f1d160 to
aff1ee5CompareJuly 23, 2024 15:11
DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 23, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 24, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

jhamman
jhamman
approved these changes
Aug 9, 2024
View reviewed changes
@jhammanjhamman
left a comment


Copy link


Copy Markdown

Member
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
Comment threadsrc/zarr/store/core.py
Outdated

Comment threadsrc/zarr/store/core.py
Outdated

@jhammanjhamman
added
the 
V3

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
jhamman
commented
Aug 22, 2024

Copy link


Copy Markdown

Member
@DimitriPapadopoulos - lots of merge conflicts here. Mind taking this one from the top?
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
It might be easier to restart from scratch. Let me have a look.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
5 times, most recently
from
a01f1b7 to
4e919e2CompareAugust 23, 2024 09:44
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
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
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
f5524ee to
80618fbCompareSeptember 2, 2024 13:09
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 2, 2024

Copy link


Copy Markdown

ContributorAuthor
Rebased.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
254b32c to
d26f5d3CompareSeptember 6, 2024 17:08
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
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.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
12e8393 to
05768eaCompareSeptember 24, 2024 21:14
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF102
0f2ec3d
PERF102 When using only the keys of a dict use the `keys()` method
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
3 times, most recently
from
df4d7e9 to
01d8480CompareSeptember 24, 2024 21:32
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
@jhamman This merge request seems ready for a review.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
d90ed39 to
b5b002aCompareSeptember 24, 2024 21:44
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF401
c71c532
PERF401 Use an async list comprehension to create a transformed list
@DimitriPapadopoulos
Apply ruff/flake8-pytest-style rule PT022
f462e1e
@DimitriPapadopoulos
Fix pre-commit warning
47930c4
Ignore lint rules conflicting with the ruff formatter
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH003
26d17cb
PGH003 Use specific rule codes when ignoring type issues
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH004
9c13559
PGH004 Use specific rule codes when using `noqa`
@DimitriPapadopoulos
Enforce ruff/pygrep-hooks rules (PGH)
8a14ef2
@DimitriPapadopoulos
Apply ruff/flake8-comprehensions rule C417
3e9c081
C417 Unnecessary `map` usage (rewrite using a generator expression)
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI032
58b88a1
PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI036
1881555
PYI036 Returning Any from function
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI038
dbadd08
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI041
85b7004
PYI041 Use `complex` instead of `float | complex`
PYI041 Use `float` instead of `int | float`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI055
eba9d47
PYI055 Multiple `type` members in a union. Combine them into one.
@jhamman
jhamman
merged commit 4cbb17e
into
zarr-developers:v3Sep 24, 2024
@jhamman
jhamman
commented
Sep 24, 2024

Copy link


Copy Markdown

Member
Thanks @DimitriPapadopoulos!
jakirkham
jakirkham
reviewed
Sep 24, 2024
View reviewed changes
Comment threadtests/v3/test_indexing.py

Comment on lines

+1785
 to 
+1787

 chunks_accessed = [
 ".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
]
@jakirkhamjakirkhamSep 24, 2024

Copy link


Copy Markdown

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) forciincomb]) forcombinitertools.product(*chunks_per_dim)
 ]
chunks_accessed= [
".".join(map(str, comb)) forcombinitertools.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
@dcherian
Merge branch 'v3' into generalize-stateful-store
ae3bca5
* 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jakirkhamjakirkhamjakirkham left review comments
@jhammanjhammanjhamman approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@DimitriPapadopoulos@jhamman@jakirkham

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Apply and enforce more ruff rules - #2053
Merged
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Sep 24, 2024
Merged
Apply and enforce more ruff rules#2053
jhamman merged 13 commits into
zarr-developers:v3from 
DimitriPapadopoulos:more_ruff
Conversation
@DimitriPapadopoulos
@DimitriPapadopoulosDimitriPapadopoulos
commented
Jul 23, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
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)
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
7 times, most recently
from
0f1d160 to
aff1ee5CompareJuly 23, 2024 15:11
DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 23, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

DimitriPapadopoulos
DimitriPapadopoulos
commented
Jul 24, 2024
View reviewed changes
Comment threadsrc/zarr/store/core.py
Outdated

jhamman
jhamman
approved these changes
Aug 9, 2024
View reviewed changes
@jhammanjhamman
left a comment


Copy link


Copy Markdown

Member
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
Comment threadsrc/zarr/store/core.py
Outdated

Comment threadsrc/zarr/store/core.py
Outdated

@jhammanjhamman
added
the 
V3

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
jhamman
commented
Aug 22, 2024

Copy link


Copy Markdown

Member
@DimitriPapadopoulos - lots of merge conflicts here. Mind taking this one from the top?
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
It might be easier to restart from scratch. Let me have a look.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
5 times, most recently
from
a01f1b7 to
4e919e2CompareAugust 23, 2024 09:44
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Aug 23, 2024

Copy link


Copy Markdown

ContributorAuthor
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
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
f5524ee to
80618fbCompareSeptember 2, 2024 13:09
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 2, 2024

Copy link


Copy Markdown

ContributorAuthor
Rebased.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
254b32c to
d26f5d3CompareSeptember 6, 2024 17:08
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
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.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
4 times, most recently
from
12e8393 to
05768eaCompareSeptember 24, 2024 21:14
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF102
0f2ec3d
PERF102 When using only the keys of a dict use the `keys()` method
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
3 times, most recently
from
df4d7e9 to
01d8480CompareSeptember 24, 2024 21:32
@DimitriPapadopoulos
DimitriPapadopoulos
commented
Sep 24, 2024

Copy link


Copy Markdown

ContributorAuthor
@jhamman This merge request seems ready for a review.
@DimitriPapadopoulos
DimitriPapadopoulosforce-pushed
the
more_ruff
branch
2 times, most recently
from
d90ed39 to
b5b002aCompareSeptember 24, 2024 21:44
@DimitriPapadopoulos
Apply ruff/Perflint rule PERF401
c71c532
PERF401 Use an async list comprehension to create a transformed list
@DimitriPapadopoulos
Apply ruff/flake8-pytest-style rule PT022
f462e1e
@DimitriPapadopoulos
Fix pre-commit warning
47930c4
Ignore lint rules conflicting with the ruff formatter
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH003
26d17cb
PGH003 Use specific rule codes when ignoring type issues
@DimitriPapadopoulos
Apply ruff/pygrep-hooks rule PGH004
9c13559
PGH004 Use specific rule codes when using `noqa`
@DimitriPapadopoulos
Enforce ruff/pygrep-hooks rules (PGH)
8a14ef2
@DimitriPapadopoulos
Apply ruff/flake8-comprehensions rule C417
3e9c081
C417 Unnecessary `map` usage (rewrite using a generator expression)
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI032
58b88a1
PYI032 Prefer `object` to `Any` for the second parameter to `__eq__`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI036
1881555
PYI036 Returning Any from function
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI038
dbadd08
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI041
85b7004
PYI041 Use `complex` instead of `float | complex`
PYI041 Use `float` instead of `int | float`
@DimitriPapadopoulos
Apply ruff/flake8-pyi rule PYI055
eba9d47
PYI055 Multiple `type` members in a union. Combine them into one.
@jhamman
jhamman
merged commit 4cbb17e
into
zarr-developers:v3Sep 24, 2024
@jhamman
jhamman
commented
Sep 24, 2024

Copy link


Copy Markdown

Member
Thanks @DimitriPapadopoulos!
jakirkham
jakirkham
reviewed
Sep 24, 2024
View reviewed changes
Comment threadtests/v3/test_indexing.py

Comment on lines

+1785
 to 
+1787

 chunks_accessed = [
 ".".join([str(ci) for ci in comb]) for comb in itertools.product(*chunks_per_dim)
]
@jakirkhamjakirkhamSep 24, 2024

Copy link


Copy Markdown

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) forciincomb]) forcombinitertools.product(*chunks_per_dim)
 ]
chunks_accessed= [
".".join(map(str, comb)) forcombinitertools.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
@dcherian
Merge branch 'v3' into generalize-stateful-store
ae3bca5
* 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jakirkhamjakirkhamjakirkham left review comments
@jhammanjhammanjhamman approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@DimitriPapadopoulos@jhamman@jakirkham