-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Revert "Remove --min_pyver_end_position
"
#9784
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
Merged
Pierre-Sassoulas
merged 4 commits into
main
from
revert-hasty-min_pyver_end_position-removal
Jul 11, 2024
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,4 @@ | ||
Remove support for launching pylint with Python 3.8. | ||
Code that supports Python 3.8 can still be linted with the ``--py-version=3.8`` setting. | ||
|
||
``--min_pyver_end_position`` in the functional test runner is no longer relevant and is removed. | ||
|
||
Refs #9774 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -5,13 +5,15 @@ | |||||
from __future__ import annotations | ||||||
|
||||||
from collections.abc import Sequence | ||||||
from typing import Any, NamedTuple | ||||||
from typing import Any, NamedTuple, TypeVar | ||||||
|
||||||
from astroid import nodes | ||||||
|
||||||
from pylint.interfaces import UNDEFINED, Confidence | ||||||
from pylint.message.message import Message | ||||||
|
||||||
_T = TypeVar("_T") | ||||||
|
||||||
|
||||||
class MessageTest(NamedTuple): | ||||||
msg_id: str | ||||||
|
@@ -39,15 +41,17 @@ class OutputLine(NamedTuple): | |||||
confidence: str | ||||||
|
||||||
@classmethod | ||||||
def from_msg(cls, msg: Message) -> OutputLine: | ||||||
def from_msg(cls, msg: Message, check_endline: bool = True) -> OutputLine: | ||||||
"""Create an OutputLine from a Pylint Message.""" | ||||||
column = cls._get_column(msg.column) | ||||||
end_line = cls._get_py38_none_value(msg.end_line, check_endline) | ||||||
end_column = cls._get_py38_none_value(msg.end_column, check_endline) | ||||||
return cls( | ||||||
msg.symbol, | ||||||
msg.line, | ||||||
column, | ||||||
msg.end_line, | ||||||
msg.end_column, | ||||||
end_line, | ||||||
end_column, | ||||||
msg.obj or "", | ||||||
msg.msg.replace("\r\n", "\n"), | ||||||
msg.confidence.name, | ||||||
|
@@ -58,8 +62,19 @@ def _get_column(column: str | int) -> int: | |||||
"""Handle column numbers.""" | ||||||
return int(column) | ||||||
|
||||||
@staticmethod | ||||||
def _get_py38_none_value(value: _T, check_endline: bool) -> _T | None: | ||||||
"""Used to make end_line and end_column None as indicated by our version | ||||||
compared to `min_pyver_end_position`. | ||||||
""" | ||||||
if not check_endline: | ||||||
return None # pragma: no cover | ||||||
return value | ||||||
|
||||||
@classmethod | ||||||
def from_csv(cls, row: Sequence[str] | str) -> OutputLine: | ||||||
def from_csv( | ||||||
cls, row: Sequence[str] | str, check_endline: bool = True | ||||||
) -> OutputLine: | ||||||
"""Create an OutputLine from a comma separated list (the functional tests | ||||||
expected output .txt files). | ||||||
""" | ||||||
|
@@ -68,8 +83,12 @@ def from_csv(cls, row: Sequence[str] | str) -> OutputLine: | |||||
try: | ||||||
line = int(row[1]) | ||||||
column = cls._get_column(row[2]) | ||||||
end_line = cls._value_to_optional_int(row[3]) | ||||||
end_column = cls._value_to_optional_int(row[4]) | ||||||
end_line = cls._value_to_optional_int( | ||||||
cls._get_py38_none_value(row[3], check_endline) | ||||||
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.
Suggested change
|
||||||
) | ||||||
end_column = cls._value_to_optional_int( | ||||||
cls._get_py38_none_value(row[4], check_endline) | ||||||
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.
Suggested change
|
||||||
) | ||||||
# symbol, line, column, end_line, end_column, node, msg, confidences | ||||||
assert len(row) == 8 | ||||||
return cls( | ||||||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.