Skip to content

Replace isort with ruff #123

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

Merged
rowanseymour merged 1 commit into from
Apr 2, 2026
Merged

Replace isort with ruff #123

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: 0 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ jobs:
- name: Run ruff
run: uv run ruff check temba_client
Copy link

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pyproject.toml sets tool.ruff.fix = true, which causes ruff check to run in fix mode by default. In CI this can auto-modify the working tree and still succeed, which may allow lint/import-order issues to slip through without failing the job. Consider running ruff check --no-fix (or adding --exit-non-zero-on-fix) so CI fails when fixes would be applied.

Suggested change
run: uv run ruff check temba_client
run: uv run ruff check --no-fix temba_client

Copilot uses AI. Check for mistakes.

- name: Run isort
run: uv run isort temba_client

- name: Run tests
run: uv run nose2 -C --coverage temba_client --coverage-report term --coverage-report xml

Expand Down
13 changes: 4 additions & 9 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Repository = "http://github.com/rapidpro/rapidpro-python"
dev = [
"coverage>=5.3,<6",
"ruff>=0.15.7,<0.16",
"isort>=5.10.1,<6",
"nose2>=0.12.0,<0.13",
]

Expand All @@ -44,13 +43,9 @@ line-length = 120
fix = true

[tool.ruff.lint]
select = ["E", "F", "W"]
select = ["E", "F", "W", "I"]
ignore = ["E501", "F405"]

[tool.isort]
multi_line_output = 3
force_grid_wrap = 0
line_length = 120
include_trailing_comma = true
combine_as_imports = true
sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
[tool.ruff.lint.isort]
combine-as-imports = true
known-first-party = ["temba_client"]
Copy link

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The prior [tool.isort] config set wrapping/formatting options (e.g., multi_line_output, include_trailing_comma, line_length). The new [tool.ruff.lint.isort] table only sets combine-as-imports and known-first-party, so Ruff will fall back to its defaults for the rest, which can change import formatting/order compared to what was previously enforced. Consider porting the relevant isort options to Ruff equivalents (or running ruff check --fix once and committing any resulting import reformat) to avoid unexpected churn later.

Suggested change
known-first-party = ["temba_client"]
known-first-party = ["temba_client"]
split-on-trailing-comma = true

Copilot uses AI. Check for mistakes.
11 changes: 0 additions & 11 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.