Skip to content

Commit e29e67f

Browse files
committed
update isort config and multi-platform grepping in Makefile
1 parent d748959 commit e29e67f

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ notes: check-bump validate-newsfragments
7373

7474
release: check-bump clean
7575
# require that upstream is configured for ethereum/<REPO_NAME>
76-
@git remote -v | grep -E "upstream\tgit@github.com:ethereum/<REPO_NAME>.git \(push\)|upstream\thttps://(www.)?github.com/ethereum/<REPO_NAME> \(push\)"
76+
@git remote -v | grep "upstream[[:space:]]git@github.com:ethereum/<REPO_NAME>.git (push)\|upstream[[:space:]]https://github.com/ethereum/<REPO_NAME> (push)"
7777
# verify that docs build correctly
7878
./newsfragments/validate_files.py is-empty
7979
make build-docs

pyproject.toml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
[tool.autoflake]
2-
remove_all_unused_imports = true
32
exclude = "__init__.py"
3+
remove_all_unused_imports = true
44

55
[tool.isort]
66
combine_as_imports = true
77
extra_standard_library = "pytest"
88
force_grid_wrap = 1
99
force_sort_within_sections = true
10-
known_third_party = "hypothesis,pytest"
10+
honor_noqa = true
1111
known_first_party = "<MODULE_NAME>"
12+
known_third_party = "hypothesis"
1213
multi_line_output = 3
1314
profile = "black"
15+
use_parentheses = true
1416

1517
[tool.mypy]
1618
check_untyped_defs = true
17-
disallow_incomplete_defs = true
18-
disallow_untyped_defs = true
1919
disallow_any_generics = true
20+
disallow_incomplete_defs = true
21+
disallow_subclassing_any = true
2022
disallow_untyped_calls = true
2123
disallow_untyped_decorators = true
22-
disallow_subclassing_any = true
24+
disallow_untyped_defs = true
2325
ignore_missing_imports = true
24-
strict_optional = true
2526
strict_equality = true
27+
strict_optional = true
2628
warn_redundant_casts = true
2729
warn_return_any = true
2830
warn_unused_configs = true
@@ -63,18 +65,18 @@ add-ignore = "D200,D203,D204,D205,D212,D302,D400,D401,D412,D415"
6365

6466
[tool.pytest.ini_options]
6567
addopts = "-v --showlocals --durations 10"
66-
xfail_strict = true
67-
log_format = "%(levelname)8s %(asctime)s %(filename)20s %(message)s"
6868
log_date_format = "%m-%d %H:%M:%S"
69+
log_format = "%(levelname)8s %(asctime)s %(filename)20s %(message)s"
70+
xfail_strict = true
6971

7072
[tool.towncrier]
7173
# Read https://github.com/ethereum/<REPO_NAME>/blob/main/newsfragments/README.md for instructions
72-
package = "<MODULE_NAME>"
73-
filename = "docs/release_notes.rst"
7474
directory = "newsfragments"
75-
underlines = ["-", "~", "^"]
76-
title_format = "<REPO_NAME> v{version} ({project_date})"
75+
filename = "docs/release_notes.rst"
7776
issue_format = "`#{issue} <https://github.com/ethereum/<REPO_NAME>/issues/{issue}>`__"
77+
package = "<MODULE_NAME>"
78+
title_format = "<REPO_NAME> v{version} ({project_date})"
79+
underlines = ["-", "~", "^"]
7880

7981
[[tool.towncrier.type]]
8082
directory = "breaking"

0 commit comments

Comments
 (0)