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

FIX: ignore whitespaces in TOML comparison #202

Merged
merged 2 commits into from
Oct 9, 2023
Merged

FIX: ignore whitespaces in TOML comparison #202

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25b7525
FIX: ignore whitespaces in TOML comparison
redeboer Oct 9, 2023
1a081d6
ENH: sort keys in Taplo config comparison
redeboer Oct 9, 2023
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
4 changes: 2 additions & 2 deletions src/repoma/check_dev_files/toml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
del expected["exclude"]
with open(CONFIG_PATH.taplo) as f:
existing = tomlkit.load(f)
expected_str = tomlkit.dumps(expected)
expected_str = tomlkit.dumps(expected, sort_keys=True)

Check warning on line 107 in src/repoma/check_dev_files/toml.py

View check run for this annotation

Codecov / codecov/patch

src/repoma/check_dev_files/toml.py#L107 

Added line #L107 was not covered by tests
existing_str = tomlkit.dumps(existing)
if existing_str != expected_str:
if existing_str.strip() != expected_str.strip():
with open(CONFIG_PATH.taplo, "w") as stream:
stream.write(expected_str)
msg = f"Updated {CONFIG_PATH.taplo} config file"
Expand Down
Loading