Skip to content

Fix ruff re errors #289

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
inducer merged 3 commits into from
Nov 25, 2024
Merged

Fix ruff re errors #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60ef949
ruff: fix re errors
alexfikl Nov 24, 2024
ca2d7c4
pyproject: switch to hatchling
alexfikl Nov 24, 2024
994b7c8
mypy: ignore pytato errors
alexfikl Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions MANIFEST.in
View file
Open in desktop

This file was deleted.

10 changes: 8 additions & 2 deletions arraycontext/impl/pytato/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ def map_data_wrapper(self, expr: DataWrapper) -> Array:

# https://github.com/pylint-dev/pylint/issues/3893
# pylint: disable=unexpected-keyword-arg
return DataWrapper(
# type-ignore: discussed at
# https://github.com/inducer/arraycontext/pull/289#discussion_r1855523967
# possibly related: https://github.com/python/mypy/issues/17375
return DataWrapper( # type: ignore[call-arg]
data=new_dw.data,
shape=expr.shape,
axes=expr.axes,
Expand Down Expand Up @@ -190,7 +193,10 @@ def map_data_wrapper(self, expr: DataWrapper) -> Array:

# https://github.com/pylint-dev/pylint/issues/3893
# pylint: disable=unexpected-keyword-arg
return DataWrapper(
# type-ignore: discussed at
# https://github.com/inducer/arraycontext/pull/289#discussion_r1855523967
# possibly related: https://github.com/python/mypy/issues/17375
return DataWrapper( # type: ignore[call-arg]
Copy link
Owner

@inducer inducer Nov 24, 2024

Choose a reason for hiding this comment

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

I actually don't understand what mypy is complaining about here. shape and data are defined as dataclass attributes?

Copy link
Collaborator Author

@alexfikl alexfikl Nov 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Yeah, I really don't know either :\ I've stared a bit at the pytato code, but it's obviously fine. It's doubly surprising since those two attributes are actually in the class itself, not in a parent..

Definitely the same thing that's confusing pylint as well though.

Copy link
Collaborator Author

@alexfikl alexfikl Nov 24, 2024

Choose a reason for hiding this comment

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

For what it's worth, doing a reveal_type(DataWrapper) says

arraycontext/impl/pytato/utils.py:193: note: Revealed type is "def (*, axes: builtins.tuple[pytato.array.Axis, ...], tags: builtins.frozenset[pytools.tag.Tag], non_equality_tags: builtins.frozenset[pytools.tag.Tag] =) -> pytato.array.DataWrapper"

so for some reason it really doesn't think those arguments are there..

Copy link
Collaborator Author

@alexfikl alexfikl Nov 24, 2024

Choose a reason for hiding this comment

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

Possibly related to this: python/mypy#17375

Copy link
Owner

@inducer inducer Nov 25, 2024

Choose a reason for hiding this comment

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

Good find, thanks. Added that as context in a comment so we don't lose it.

data=np_data,
shape=expr.shape,
axes=expr.axes,
Expand Down
2 changes: 1 addition & 1 deletion arraycontext/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
def _parse_version(version: str) -> tuple[tuple[int, ...], str]:
import re

m = re.match("^([0-9.]+)([a-z0-9]*?)$", VERSION_TEXT)
m = re.match(r"^([0-9.]+)([a-z0-9]*?)$", VERSION_TEXT)
assert m is not None

return tuple(int(nr) for nr in m.group(1).split(".")), m.group(2)
Expand Down
20 changes: 2 additions & 18 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = [
"setuptools>=63",
]
requires = ["hatchling"]
build-backend = "hatchling.build"

[project]
name = "arraycontext"
Expand Down Expand Up @@ -57,20 +55,6 @@ test = [
Documentation = "https://documen.tician.de/arraycontext"
Homepage = "https://github.com/inducer/arraycontext"

[tool.setuptools.packages.find]
include = [
"arraycontext*",
]

[tool.setuptools.package-dir]
# https://github.com/Infleqtion/client-superstaq/pull/715
"" = "."

[tool.setuptools.package-data]
pytools = [
"py.typed",
]

[tool.ruff]
preview = true

Expand Down
Loading