-
-
Notifications
You must be signed in to change notification settings - Fork 541
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
chore: Update linters and essential configurations #743
base: master
Are you sure you want to change the base?
Changes from all commits
1bedda1
bc89992
35e564f
9d18d70
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,6 @@ | ||
tests/results/* | ||
|
||
# Python | ||
__pycache__/ | ||
*.py[cod] | ||
node_modules/ |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,7 +45,7 @@ repos: | |
|
||
# Dockerfile linter | ||
- repo: https://github.com/hadolint/hadolint | ||
rev: v2.12.1-beta | ||
rev: v2.13.1-beta | ||
hooks: | ||
- id: hadolint | ||
args: [ | ||
|
@@ -66,3 +66,84 @@ repos: | |
- id: prettier | ||
# https://prettier.io/docs/en/options.html#parser | ||
files: '.json5$' | ||
|
||
|
||
########## | ||
# PYTHON # | ||
########## | ||
|
||
- repo: https://github.com/astral-sh/ruff-pre-commit | ||
rev: v0.8.4 | ||
hooks: | ||
- id: ruff | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Inconsistent indentation. This moment when you add more checks but not yamllint 😂 |
||
args: [--fix] | ||
types_or: [python, pyi] | ||
- id: ruff-format | ||
types_or: [python, pyi] | ||
args: [--config, format.quote-style = 'single', --config, line-length = 100] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There should be a good reason(s) to deviate from linter's default settings. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's not because of the defaults (for which sometimes there are good reasons to change) but because other tools wouldn't pick this up, it should be avoided (with a few well-defined exceptions like the one I've got for MyPy). For this reason, every low-level tool must be configured via its own autoloaded config file name. Otherwise, everybody would have to duplicate this config in their editors, IDEs, other tools and sometimes CI, and would have toe know upfront that this is necessary. Being surprised by unexpected behaviors when they don't. I have some notes on this in #742. I wouldn't say that setting such a long line setting has a merit, though. I'm a firm believer that in the name of readability/inclusivity/maintainability, code should be readable in columns. Just like any text, typography can govern column width for code too. This is directly connected to readability (which is why magazines and newspapers don't print lines from one side of the page to the others, and some books / catalogs use columns). Typographically optimal columns are between 50 and 75 chars (opinions vary, but mostly close to this range): https://baymard.com/blog/line-length-readability. We have a long-standing convention of 79 that exceeds it a bit, but isn't as critical. It allows for columns in editors for working on multiple files while still using enlarged fonts. It also allows for side-by-side diffs. The lines fit on the screen in these settings as well as allow for column-based top-down reading (which is another thing humans do with text naturally, by habit). |
||
|
||
- repo: https://github.com/pycqa/isort | ||
rev: 5.13.2 | ||
hooks: | ||
- id: isort | ||
name: isort | ||
args: [--force-single-line, --profile=black] | ||
|
||
- repo: https://github.com/asottile/add-trailing-comma | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This one might be fine to combine with Ruff. But you'll have to put it first and also check if they don't cancel each other out in the way they're configured. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. They don't There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I wouldn't be so sure. I've seen corner cases with various formatters where they'd do this very occasionally under certain conditions. It's good that we haven't observed such a behavior here. I'm just saying that this should be kept in mind for the future in case it does happen. If Ruff does not implement a similar capability, it stands to reason that it's okay to keep this formatter. If it does, it might not make sense. But if you decide to keep this one, make sure to move it along with any other small narrow-scoped formatters before the Ruff run. |
||
rev: v3.1.0 | ||
hooks: | ||
- id: add-trailing-comma | ||
|
||
- repo: https://github.com/pre-commit/mirrors-autopep8 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's usually unnecessary to use multiple generic code formatters, as they tend to step on each other's toes, resulting in infinite reformatting of the same things back and forth. Choose one and stick with it. It's typically fine with a few smaller ones that change small non-intersecting aspects of files, though. But they may have to be ordered correctly. |
||
rev: v2.0.4 | ||
hooks: | ||
- id: autopep8 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. With Ruff in formatting mode, this is probably unnecessary. I'm yet to compare their output, but the recommendation is going to be the same as with pylint for now. |
||
args: | ||
- -i | ||
- --max-line-length=100 | ||
Comment on lines
+101
to
+103
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Out of interest: why do you sometimes use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sometimes it depends on how hook configured - IE [--config, format.quote-style = 'single', --config, line-length = 100] will be actually more readble as [
--config, format.quote-style = 'single',
--config, line-length = 100
] not - --config
- format.quote-style = 'single'
- --config
- line-length = 100 But I don't remember why I can't use multiline array with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is rather subjective. I'd argue that Actually, for |
||
|
||
# Usage: http://pylint.pycqa.org/en/latest/user_guide/message-control.html | ||
- repo: https://github.com/PyCQA/pylint | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I experimented with configuring this linter for a while, but I'm hitting a few bugs within. You're also integrating Ruff which reimplements most if not all of pylint rules in it. It doesn't really make sense to have multiple linters report the same violation multiple times within each With that in mind, I recommend abandoning There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, I guess it's a worthwhile suggestion. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. FWIW, I'm planning to research replacing many things with Ruff in my projects but just didn't get to do a full comparison. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, ruff has rules that should be manually enabled? Didn't know it From what I saw - pylint in its current configuration provides additional checks which are not covered by There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
😆 this is the slowest checker I know. This is because it goes beyond static analysis and does some dynamic checking as well. As for ruff, I wanted to research it more. And yes, there's rules that are disabled by default in all the linters I've ever met (flake8, pylint, ruff). Some updates to pylint sometimes move the rules from default to extensions too — this is why I prefer an explicit config to make sure that it doesn't suddenly stop checking something just because of a version bump. While I do like pylint in general, I tried it locally on this codebase and there's bugs in it that block really adding it in full capacity. Hence, the idea to delay adding it. I may end up debugging the issue for my other projects. But in general, many people stick with flake8 because it's not as slow and easier to extend. We do run it in My initial strategy for adopting Ruff would be enabling as much as possible there, and only if some rule is not ported, then run flake8/pylint (with plugins) only checking those rules, to reduce the overhead. It's good for DX when the same problem isn't reported by 5 different checkers. |
||
rev: v3.3.3 | ||
hooks: | ||
- id: pylint | ||
args: | ||
- --disable=import-error # E0401. Locally you could not have all imports. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Avoid putting linter settings into CLI args at all costs. This is incompatible with literally everything that would run said linters. Always keep them in tool-specific configs. |
||
- --disable=fixme # W0511. 'TODO' notations. | ||
- --disable=logging-fstring-interpolation # Conflict with "use a single formatting" WPS323 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Drop this. Logging actually shouldn't be using f-strings. |
||
- --disable=ungrouped-imports # ignore `if TYPE_CHECKING` case. Other do reorder-python-imports | ||
- --disable=R0801 # Similar lines in 2 files. Currently I don't think that it possible to DRY hooks unique files boilerplate | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't use numeric rule codes in pylint. It has human-readable names that make much more sense than random digit sequences. Also, instead of disabling the rules, many pylint and flake8 rules can remain enabled because they allow tweaking their settings. I know for a fact that this duplication rule allows increasing the number of lines to take into account. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have this configured by default 🤷♂️ You should've just used my config. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unfortunately, Ruff does not allow using those names in ignores, while the rules may have human-readable names. There's a feature request about it. |
||
|
||
- repo: https://github.com/pre-commit/mirrors-mypy | ||
rev: v1.14.1 | ||
hooks: | ||
- id: mypy | ||
additional_dependencies: | ||
- types-PyYAML | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why four rather than two spaces indentation at this line? 😕 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yamllint all the things! I'd add https://github.com/ansible/awx-plugins/blob/53ebc59/.yamllint with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
args: [ | ||
--ignore-missing-imports, | ||
--disallow-untyped-calls, | ||
--warn-redundant-casts, | ||
Comment on lines
+124
to
+126
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nothing should be disabled globally. Suppressions must be granular, which can be implemented in the config and in-module. |
||
] | ||
|
||
- repo: https://github.com/wemake-services/wemake-python-styleguide | ||
rev: 1.0.0 | ||
hooks: | ||
- id: wemake-python-styleguide | ||
args: | ||
- --allowed-module-metadata=__all__ # Default to '' | ||
- --max-local-variables=6 # Default to 5 | ||
- --max-returns=6 # Default to 5 | ||
- --max-imports=15 # Default to 12 | ||
# https://wemake-python-stylegui.de/en/latest/pages/usage/violations/index.html | ||
- --extend-ignore= | ||
E501 <!-- line too long (> 79 characters). Use 100 --> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Configurable rules shouldn't be ignored really. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. WPS can show shortlinks to the rules, you just didn't enable it 🤷♂️ This is the setting: https://flake8.pycqa.org/en/latest/user/options.html#cmdoption-flake8-max-line-length. But anyway, it doesn't make sense to have such things as CLI args. I can send in a good config structure where it's more apparent what should go where. |
||
WPS115 <!-- Found upper-case constant in a class. All occurrences are false positive --> | ||
WPS226 <!-- Found string literal over-use - append > 3 --> | ||
|
||
|
||
exclude: | | ||
(?x) | ||
# Ignore deprecated hook | ||
(^src/pre_commit_terraform/terraform_docs_replace.py$ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should instead go into the flake8 config. |
||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,4 +7,7 @@ | |
"code-block-style": false | ||
}, | ||
"markdown.validate.enabled": true, | ||
"python.analysis.extraPaths": [ | ||
"./src" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also, include the tests dir. |
||
], | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,15 +9,12 @@ build-backend = 'hatchling.build' | |
name = 'pre-commit-terraform' | ||
classifiers = [ | ||
'License :: OSI Approved :: MIT License', | ||
'Programming Language :: Python :: 2', | ||
'Programming Language :: Python :: 2.7', | ||
'Programming Language :: Python :: 3', | ||
'Programming Language :: Python :: 3.6', | ||
'Programming Language :: Python :: 3.7', | ||
Comment on lines
-12
to
-16
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's best to list envs tested in CI here. |
||
'Programming Language :: Python :: 3 :: Only', | ||
'Programming Language :: Python :: Implementation :: CPython', | ||
'Programming Language :: Python :: Implementation :: PyPy', | ||
] | ||
description = 'Pre-commit hooks for terraform_docs_replace' | ||
description = 'Pre-commit hooks for Terraform' | ||
dependencies = [] | ||
dynamic = [ | ||
'urls', | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
"""A runpy-style CLI entry-point module.""" | ||
|
||
from sys import argv, exit as exit_with_return_code | ||
from sys import argv | ||
from sys import exit as exit_with_return_code | ||
|
||
from ._cli import invoke_cli_app | ||
|
||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will probably go away with a proper config. |
||
return_code = invoke_cli_app(argv[1:]) | ||
exit_with_return_code(return_code) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With pre-commit, the primary ordering should be by whether something is faster or slower. Putting instant checks at the beginning improves responsiveness, with the slow ones stuffed at the end. The second factor is formatters vs. linters. When a bunch of formatters change some type of files, they should be executed before the linters that check the same files.
The ecosystem is something that could be used to bundle similar checks within those groups. But it's definitely not something that would be top level.