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.

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

refactor #183

Merged
merged 13 commits into from
Jan 18, 2025
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
refactor: ruff fixes
15r10nk committed Jan 18, 2025
commit 2df58e5759a1cfdab20ab436cc295e7f5ba7e000
2 changes: 1 addition & 1 deletion src/inline_snapshot/_adapter/dict_adapter.py
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ def assign(self, old_value, old_node, new_value):
old_value.keys(),
(old_node.values if old_node is not None else [None] * len(old_value)),
):
if not key in new_value:
if key not in new_value:
# delete entries
yield Delete("fix", self.context.file._source, node, old_value[key])

15 changes: 11 additions & 4 deletions src/inline_snapshot/_adapter/generic_call_adapter.py
Original file line number Diff line number Diff line change
@@ -83,10 +83,17 @@ def items(cls, value, node):
assert isinstance(node, ast.Call)
assert all(kw.arg for kw in node.keywords)
kw_arg_node = {kw.arg: kw.value for kw in node.keywords if kw.arg}.get
pos_arg_node = lambda pos: node.args[pos]

def pos_arg_node(pos):
return node.args[pos]

else:
kw_arg_node = lambda _: None
pos_arg_node = lambda _: None

def kw_arg_node(_):
return None

def pos_arg_node(_):
return None

return [
Item(value=arg.value, node=pos_arg_node(i))
@@ -166,7 +173,7 @@ def assign(self, old_value, old_node, new_value):
# keyword arguments
result_kwargs = {}
for kw in old_node.keywords:
if (missing := not kw.arg in new_kwargs) or new_kwargs[kw.arg].is_default:
if (missing := kw.arg not in new_kwargs) or new_kwargs[kw.arg].is_default:
# delete entries
yield Delete(
"fix" if missing else "update",
1 change: 0 additions & 1 deletion src/inline_snapshot/_inline_snapshot.py
Original file line number Diff line number Diff line change
@@ -111,7 +111,6 @@ class SnapshotReference:
def __init__(self, value, expr, context: AdapterContext):
self._expr = expr
node = expr.node.args[0] if expr is not None and expr.node.args else None
source = expr.source if expr is not None else None
self._value = UndecidedValue(value, node, context)

def _changes(self):
2 changes: 1 addition & 1 deletion src/inline_snapshot/_snapshot/min_max_value.py
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ class MinMaxValue(GenericValue):

@staticmethod
def cmp(a, b):
raise NotImplemented
raise NotImplementedError

def _generic_cmp(self, other):
if self._old_value is undefined:
4 changes: 2 additions & 2 deletions src/inline_snapshot/pytest_plugin.py
Original file line number Diff line number Diff line change
@@ -150,7 +150,7 @@ def snapshot_check():
if missing_values != 0 and not state().update_flags.create:
pytest.fail(
(
f"your snapshot is missing one value."
"your snapshot is missing one value."
if missing_values == 1
else f"your snapshot is missing {missing_values} values."
),
@@ -243,7 +243,7 @@ def apply_changes(flag):
console.print()
return result
else:
console.print(f"These changes are not applied.")
console.print("These changes are not applied.")
console.print(
f"Use [b]--inline-snapshot={flag}[/] to apply them, or use the interactive mode with [b]--inline-snapshot=review[/]",
highlight=False,
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
@@ -138,7 +138,7 @@ def run(self, *flags_arg: Category):
source = filename.read_text("utf-8")[len(prefix) :]
print("reported_flags:", snapshot_flags)
print(
f"run: pytest" + f' --inline-snapshot={",".join(flags.to_set())}'
f'run: pytest --inline-snapshot={",".join(flags.to_set())}'
if flags
else ""
)
3 changes: 1 addition & 2 deletions tests/test_docs.py
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@ def map_code_blocks(file, func, fix=False):
current_code = file.read_text("utf-8")
new_lines = []
block_lines = []
options = set()
is_block = False
code = None
indent = ""
@@ -156,7 +155,7 @@ def test_block(block):
if recorded_markdown_code != markdown_code:
assert new_markdown_code == recorded_markdown_code
else:
assert new_markdown_code == None
assert new_markdown_code is None

test_doc(
"""
2 changes: 1 addition & 1 deletion tests/test_external.py
Original file line number Diff line number Diff line change
@@ -170,7 +170,7 @@ def test_a():
"""
)

result = project.run("--inline-snapshot=create")
project.run("--inline-snapshot=create")

assert project.source == snapshot(
"""\
2 changes: 1 addition & 1 deletion tests/test_rewrite_code.py
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ def test_range():
assert range_of(r) == r

with pytest.raises(ValueError):
rr = SourceRange(b, a)
SourceRange(b, a)


def test_rewrite(tmp_path):