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

Pass project root to ruff-api #232

Merged
merged 1 commit into from
Aug 23, 2024
Merged

Pass project root to ruff-api #232

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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ lsp = [
"pygls >= 1.3",
]
ruff = [
"ruff-api>=0.0.5",
"ruff-api>=0.0.8",
]
dev = [
"attribution==1.8.0",
Expand Down
9 changes: 8 additions & 1 deletion ufmt/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,14 @@ def ufmt_bytes(
],
)
content_str = ruff_api.isort_string(
path.as_posix(), content.decode(encoding), options=ruff_isort_options
path.as_posix(),
content.decode(encoding),
options=ruff_isort_options,
root=(
ufmt_config.project_root.as_posix()
if ufmt_config.project_root
else None
),
)
content = content_str.encode(encoding)
elif ufmt_config.sorter == Sorter.skip:
Expand Down
11 changes: 8 additions & 3 deletions ufmt/tests/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from pathlib import Path
from tempfile import TemporaryDirectory
from unittest import TestCase
from unittest.mock import call, Mock, patch
from unittest.mock import ANY, call, Mock, patch

import black
import ruff_api
Expand Down Expand Up @@ -250,7 +250,10 @@ def test_ufmt_bytes_alternate_sorter(
usort_config=usort_config,
)
self.assertEqual(CORRECTLY_FORMATTED_CODE.encode(), result)
usort_mock.assert_called_once()
usort_mock.assert_called_with(
POORLY_FORMATTED_CODE.encode(), usort_config, Path("foo.py")
)
ruff_mock.assert_not_called()

with self.subTest("ruff-api"):
usort_mock.reset_mock()
Expand All @@ -263,7 +266,9 @@ def test_ufmt_bytes_alternate_sorter(
)
self.assertEqual(CORRECTLY_FORMATTED_CODE.encode(), result)
usort_mock.assert_not_called()
ruff_mock.assert_called_once()
ruff_mock.assert_called_with(
"foo.py", POORLY_FORMATTED_CODE, options=ANY, root=None
)

with self.subTest("skip"):
usort_mock.reset_mock()
Expand Down
Loading