Skip to content
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

Add applicability to flake8_pytest_style #5389

Merged
merged 1 commit into from
Jun 27, 2023
Merged

Add applicability to flake8_pytest_style #5389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,7 @@ pub(crate) fn unittest_assertion(
&& !has_comments_in(expr.range(), checker.locator)
{
if let Ok(stmt) = unittest_assert.generate_assert(args, keywords) {
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
checker.generator().stmt(&stmt),
expr.range(),
)));
Expand Down
15 changes: 5 additions & 10 deletions crates/ruff/src/rules/flake8_pytest_style/rules/fixture.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,7 @@ fn check_fixture_decorator(checker: &mut Checker, func_name: &str, decorator: &D
&& args.is_empty()
&& keywords.is_empty()
{
#[allow(deprecated)]
let fix = Fix::unspecified(Edit::deletion(func.end(), decorator.end()));
let fix = Fix::automatic(Edit::deletion(func.end(), decorator.end()));
pytest_fixture_parentheses(
checker,
decorator,
Expand Down Expand Up @@ -346,8 +345,7 @@ fn check_fixture_decorator(checker: &mut Checker, func_name: &str, decorator: &D
if checker.enabled(Rule::PytestFixtureIncorrectParenthesesStyle)
&& checker.settings.flake8_pytest_style.fixture_parentheses
{
#[allow(deprecated)]
let fix = Fix::unspecified(Edit::insertion(
let fix = Fix::automatic(Edit::insertion(
Parentheses::Empty.to_string(),
decorator.end(),
));
Expand Down Expand Up @@ -406,8 +404,7 @@ fn check_fixture_returns(checker: &mut Checker, stmt: &Stmt, name: &str, body: &
stmt.range(),
);
if checker.patch(diagnostic.kind.rule()) {
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
"return".to_string(),
TextRange::at(stmt.start(), "yield".text_len()),
)));
Expand Down Expand Up @@ -486,8 +483,7 @@ fn check_fixture_marks(checker: &mut Checker, decorators: &[Decorator]) {
Diagnostic::new(PytestUnnecessaryAsyncioMarkOnFixture, expr.range());
if checker.patch(diagnostic.kind.rule()) {
let range = checker.locator.full_lines_range(expr.range());
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(range)));
diagnostic.set_fix(Fix::automatic(Edit::range_deletion(range)));
}
checker.diagnostics.push(diagnostic);
}
Expand All @@ -499,8 +495,7 @@ fn check_fixture_marks(checker: &mut Checker, decorators: &[Decorator]) {
Diagnostic::new(PytestErroneousUseFixturesOnFixture, expr.range());
if checker.patch(diagnostic.kind.rule()) {
let line_range = checker.locator.full_lines_range(expr.range());
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(line_range)));
diagnostic.set_fix(Fix::automatic(Edit::range_deletion(line_range)));
}
checker.diagnostics.push(diagnostic);
}
Expand Down
9 changes: 3 additions & 6 deletions crates/ruff/src/rules/flake8_pytest_style/rules/marks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,13 @@ fn check_mark_parentheses(checker: &mut Checker, decorator: &Decorator, call_pat
&& args.is_empty()
&& keywords.is_empty()
{
#[allow(deprecated)]
let fix = Fix::unspecified(Edit::deletion(func.end(), decorator.end()));
let fix = Fix::automatic(Edit::deletion(func.end(), decorator.end()));
pytest_mark_parentheses(checker, decorator, call_path, fix, "", "()");
}
}
_ => {
if checker.settings.flake8_pytest_style.mark_parentheses {
#[allow(deprecated)]
let fix = Fix::unspecified(Edit::insertion("()".to_string(), decorator.end()));
let fix = Fix::automatic(Edit::insertion("()".to_string(), decorator.end()));
pytest_mark_parentheses(checker, decorator, call_path, fix, "()", "");
}
}
Expand All @@ -114,8 +112,7 @@ fn check_useless_usefixtures(checker: &mut Checker, decorator: &Decorator, call_
if !has_parameters {
let mut diagnostic = Diagnostic::new(PytestUseFixturesWithoutParameters, decorator.range());
if checker.patch(diagnostic.kind.rule()) {
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_deletion(decorator.range())));
diagnostic.set_fix(Fix::suggested(Edit::range_deletion(decorator.range())));
}
checker.diagnostics.push(diagnostic);
}
Expand Down
21 changes: 7 additions & 14 deletions crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) {
ctx: ExprContext::Load,
range: TextRange::default(),
});
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
format!("({})", checker.generator().expr(&node)),
name_range,
)));
Expand Down Expand Up @@ -195,8 +194,7 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) {
ctx: ExprContext::Load,
range: TextRange::default(),
});
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
checker.generator().expr(&node),
name_range,
)));
Expand Down Expand Up @@ -228,8 +226,7 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) {
ctx: ExprContext::Load,
range: TextRange::default(),
});
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
checker.generator().expr(&node),
expr.range(),
)));
Expand All @@ -245,8 +242,7 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) {
);
if checker.patch(diagnostic.kind.rule()) {
if let Some(content) = elts_to_csv(elts, checker.generator()) {
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
content,
expr.range(),
)));
Expand Down Expand Up @@ -278,8 +274,7 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) {
ctx: ExprContext::Load,
range: TextRange::default(),
});
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
format!("({})", checker.generator().expr(&node)),
expr.range(),
)));
Expand All @@ -295,8 +290,7 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) {
);
if checker.patch(diagnostic.kind.rule()) {
if let Some(content) = elts_to_csv(elts, checker.generator()) {
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
content,
expr.range(),
)));
Expand Down Expand Up @@ -373,8 +367,7 @@ fn handle_single_name(checker: &mut Checker, expr: &Expr, value: &Expr) {

if checker.patch(diagnostic.kind.rule()) {
let node = value.clone();
#[allow(deprecated)]
diagnostic.set_fix(Fix::unspecified(Edit::range_replacement(
diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
checker.generator().expr(&node),
expr.range(),
)));
Expand Down
6 changes: 3 additions & 3 deletions ...flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_default.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PT001.py:9:1: PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
|
= help: Add parentheses

ℹ Suggested fix
ℹ Fix
6 6 | # `import pytest`
7 7 |
8 8 |
Expand All @@ -29,7 +29,7 @@ PT001.py:34:1: PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
|
= help: Add parentheses

ℹ Suggested fix
ℹ Fix
31 31 | # `from pytest import fixture`
32 32 |
33 33 |
Expand All @@ -48,7 +48,7 @@ PT001.py:59:1: PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture`
|
= help: Add parentheses

ℹ Suggested fix
ℹ Fix
56 56 | # `from pytest import fixture as aliased`
57 57 |
58 58 |
Expand Down
12 changes: 6 additions & 6 deletions ...pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT001_no_parentheses.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PT001.py:14:1: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
|
= help: Remove parentheses

ℹ Suggested fix
ℹ Fix
11 11 | return 42
12 12 |
13 13 |
Expand All @@ -31,7 +31,7 @@ PT001.py:24:1: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
|
= help: Remove parentheses

ℹ Suggested fix
ℹ Fix
21 21 | return 42
22 22 |
23 23 |
Expand All @@ -52,7 +52,7 @@ PT001.py:39:1: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
|
= help: Remove parentheses

ℹ Suggested fix
ℹ Fix
36 36 | return 42
37 37 |
38 38 |
Expand All @@ -73,7 +73,7 @@ PT001.py:49:1: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
|
= help: Remove parentheses

ℹ Suggested fix
ℹ Fix
46 46 | return 42
47 47 |
48 48 |
Expand All @@ -94,7 +94,7 @@ PT001.py:64:1: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
|
= help: Remove parentheses

ℹ Suggested fix
ℹ Fix
61 61 | return 42
62 62 |
63 63 |
Expand All @@ -115,7 +115,7 @@ PT001.py:74:1: PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()`
|
= help: Remove parentheses

ℹ Suggested fix
ℹ Fix
71 71 | return 42
72 72 |
73 73 |
Expand Down
4 changes: 2 additions & 2 deletions ...les/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT006_csv.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ PT006.py:29:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expe
|
= help: Use a `csv` for parameter names

ℹ Suggested fix
ℹ Fix
26 26 | ...
27 27 |
28 28 |
Expand Down Expand Up @@ -67,7 +67,7 @@ PT006.py:39:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expe
|
= help: Use a `csv` for parameter names

ℹ Suggested fix
ℹ Fix
36 36 | ...
37 37 |
38 38 |
Expand Down
4 changes: 2 additions & 2 deletions ...flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT006_default.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ PT006.py:29:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expe
|
= help: Use a `csv` for parameter names

ℹ Suggested fix
ℹ Fix
26 26 | ...
27 27 |
28 28 |
Expand Down Expand Up @@ -105,7 +105,7 @@ PT006.py:39:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expe
|
= help: Use a `csv` for parameter names

ℹ Suggested fix
ℹ Fix
36 36 | ...
37 37 |
38 38 |
Expand Down
4 changes: 2 additions & 2 deletions ...es/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT006_list.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ PT006.py:29:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expe
|
= help: Use a `csv` for parameter names

ℹ Suggested fix
ℹ Fix
26 26 | ...
27 27 |
28 28 |
Expand All @@ -105,7 +105,7 @@ PT006.py:39:26: PT006 [*] Wrong name(s) type in `@pytest.mark.parametrize`, expe
|
= help: Use a `csv` for parameter names

ℹ Suggested fix
ℹ Fix
36 36 | ...
37 37 |
38 38 |
Expand Down
2 changes: 1 addition & 1 deletion ...c/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT022.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PT022.py:17:5: PT022 [*] No teardown in fixture `error`, use `return` instead of
|
= help: Replace `yield` with `return`

ℹ Suggested fix
ℹ Fix
14 14 | @pytest.fixture()
15 15 | def error():
16 16 | resource = acquire_resource()
Expand Down
10 changes: 5 additions & 5 deletions ...flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT023_default.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PT023.py:12:1: PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
9 9 | # Without parentheses
10 10 |
11 11 |
Expand All @@ -29,7 +29,7 @@ PT023.py:17:1: PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
14 14 | pass
15 15 |
16 16 |
Expand All @@ -49,7 +49,7 @@ PT023.py:24:5: PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
21 21 |
22 22 |
23 23 | class TestClass:
Expand All @@ -69,7 +69,7 @@ PT023.py:30:5: PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
27 27 |
28 28 |
29 29 | class TestClass:
Expand All @@ -90,7 +90,7 @@ PT023.py:38:9: PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
35 35 |
36 36 | class TestClass:
37 37 | class TestNestedClass:
Expand Down
10 changes: 5 additions & 5 deletions ...pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT023_no_parentheses.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PT023.py:46:1: PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
43 43 | # With parentheses
44 44 |
45 45 |
Expand All @@ -29,7 +29,7 @@ PT023.py:51:1: PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
48 48 | pass
49 49 |
50 50 |
Expand All @@ -49,7 +49,7 @@ PT023.py:58:5: PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
55 55 |
56 56 |
57 57 | class TestClass:
Expand All @@ -69,7 +69,7 @@ PT023.py:64:5: PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
61 61 |
62 62 |
63 63 | class TestClass:
Expand All @@ -90,7 +90,7 @@ PT023.py:72:9: PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()`
|
= help: Add/remove parentheses

ℹ Suggested fix
ℹ Fix
69 69 |
70 70 | class TestClass:
71 71 | class TestNestedClass:
Expand Down
Loading