Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ repos:
types: [python]
- id: sort-mypy-weaklist
name: sort mypy weaklist
entry: python3 -m tools.mypy_helpers.sort_stronger_modules
entry: python3 -m tools.mypy_helpers.sort_weaklist
files: ^pyproject\.toml$
language: python
- id: check-mypy-weaklist
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from pathlib import Path

from tools.mypy_helpers.sort_stronger_modules import main
from tools.mypy_helpers.sort_weaklist import main


def test_sort_stronger_modules(tmp_path: Path) -> None:
def test_sort_weaklist(tmp_path: Path) -> None:
src = """\
# before

Expand Down
31 changes: 1 addition & 30 deletions tools/mypy_helpers/sort_stronger_modules.py
Original file line number Diff line number Diff line change
@@ -1,35 +1,6 @@
from __future__ import annotations

import argparse
from collections.abc import Sequence


def main(argv: Sequence[str] | None = None) -> int:
parser = argparse.ArgumentParser()
parser.add_argument("filenames", nargs="*")
args = parser.parse_args(argv)

ret = 0
for filename in args.filenames:
with open(filename) as f:
contents = f.read()

rest = contents
b1, m1, rest = rest.partition("# begin: not yet strongly typed\n")
b2, m2, rest = rest.partition("module = [\n")
b3, m3, rest = rest.partition("]\n")
b4, m4, rest = rest.partition("# end: not yet strongly typed\n")

b3 = "".join(sorted(frozenset(b3.splitlines(True))))

new_contents = b1 + m1 + b2 + m2 + b3 + m3 + b4 + m4 + rest
if new_contents != contents:
with open(filename, "w") as f:
f.write(new_contents)
ret = 1

return ret

from tools.mypy_helpers.sort_weaklist import main
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

We will keep both scripts until getsentry is merged.


if __name__ == "__main__":
raise SystemExit(main())
35 changes: 35 additions & 0 deletions tools/mypy_helpers/sort_weaklist.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
from __future__ import annotations

import argparse
from collections.abc import Sequence


def main(argv: Sequence[str] | None = None) -> int:
parser = argparse.ArgumentParser()
parser.add_argument("filenames", nargs="*")
args = parser.parse_args(argv)

ret = 0
for filename in args.filenames:
with open(filename) as f:
contents = f.read()

rest = contents
b1, m1, rest = rest.partition("# begin: not yet strongly typed\n")
b2, m2, rest = rest.partition("module = [\n")
b3, m3, rest = rest.partition("]\n")
b4, m4, rest = rest.partition("# end: not yet strongly typed\n")

b3 = "".join(sorted(frozenset(b3.splitlines(True))))

new_contents = b1 + m1 + b2 + m2 + b3 + m3 + b4 + m4 + rest
if new_contents != contents:
with open(filename, "w") as f:
f.write(new_contents)
ret = 1

return ret


if __name__ == "__main__":
raise SystemExit(main())
Loading