Skip to content

Commit 987a605

Browse files
committed
build: Replace isort with ruff.
Drop the direct isort requirement and migrate the isort config to ruff config.
1 parent 3f94093 commit 987a605

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

pyproject.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ exclude = [
213213
]
214214

215215
[tool.ruff.lint]
216-
select = ["E", "W"]
216+
select = ["E", "W", "I"]
217217
ignore = [
218218
"E402", # module level import not at top of file
219219
"E501", # line too long (pylint enforces this at 120 chars while ignoring trailing comments)
@@ -226,12 +226,6 @@ ignore = [
226226
"E721", # use `isinstance()` for type comparisons
227227
]
228228

229-
[tool.isort]
230-
indent = " "
231-
line_length = 120
232-
multi_line_output = 3
233-
skip = ["envs", "migrations"]
234-
235229
[tool.importlinter]
236230
root_packages = ["lms", "cms", "openedx", "openedx_content", "openedx_catalog"]
237231
include_external_packages = true

requirements/edx/testing.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ factory-boy # Library for creating test fixtures, used in many tes
2727
freezegun # Allows tests to mock the output of assorted datetime module functions
2828
httpretty # Library for mocking HTTP requests, used in many tests
2929
import-linter # Tool for making assertions about which modules can import which others
30-
isort # For checking and fixing the order of imports
3130
mock # Deprecated alias to standard library `unittest.mock`
3231
ruff # Fast Python linter and formatter
3332
polib # Library for manipulating gettext translation files, used to test paver i18n commands

requirements/edx/testing.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -865,9 +865,7 @@ isodate==0.7.2
865865
# -r requirements/edx/base.txt
866866
# python3-saml
867867
isort==8.0.1
868-
# via
869-
# -r requirements/edx/testing.in
870-
# pylint
868+
# via pylint
871869
jinja2==3.1.6
872870
# via
873871
# -r requirements/edx/base.txt

0 commit comments

Comments
 (0)