Remove black, isort and flake8 in favour of ruff

Author: oathlesss

.gitignore

@@ -22,6 +22,7 @@ pip-selfcheck.json
 *djlsp.log
 .DS_Store
 .mypy_cache
+.ruff_cache
 .template-version
 .vscode
 .pytest_cache/

Makefile

@@ -19,13 +19,12 @@ $(ENV):
 develop: $(ENV)
 
 fix-codestyle:
-	$(BIN)/black $(CODE_LOCATIONS)
-	$(BIN)/isort $(CODE_LOCATIONS)
+	$(BIN)/ruff check --fix $(CODE_LOCATIONS)
+	$(BIN)/ruff format $(CODE_LOCATIONS)
 
 lint:
-	$(BIN)/black --check $(CODE_LOCATIONS)
-	$(BIN)/isort --check-only $(CODE_LOCATIONS)
-	$(BIN)/flake8 $(CODE_LOCATIONS)
+	$(BIN)/ruff check $(CODE_LOCATIONS)
+	$(BIN)/ruff format --check $(CODE_LOCATIONS)
 
 test: lint
 	$(BIN)/tox run

README.md

@@ -30,8 +30,8 @@ This LSP supports:
 
 ## Support (tested)
 
-- Python: 3.10, 3.11, 3.12, 3.13
-- Django: 4.2, 5.0, 5.1, 5.2
+- Python: 3.10, 3.11, 3.12, 3.13, 3.14
+- Django: 4.2, 5.0, 5.1, 5.2, 6.0
 
 
 ## Installation
@@ -121,6 +121,12 @@ To use the Django template LSP with VSCode read the following [readme](vscode/RE
 
 ## Development
 
+Install development dependencies:
+
+```bash
+make develop
+```
+
 For local development, using [Helix](https://helix-editor.com) is the easiest approach.
 The configuration for using the source Django template language server, with logging enabled, is already set up.
 

djlsp/parser.py

@@ -33,7 +33,6 @@ def clear_completions_cache():
 
 
 class TemplateParser:
-
     def __init__(
         self,
         workspace_index: WorkspaceIndex,
@@ -170,7 +169,8 @@ def create_jedi_script(
 
         script_lines = []
         if re.search(r"{% ?for ", self.document.source):
-            script_lines.append(dedent('''
+            script_lines.append(
+                dedent('''
                     class _DjangoForLoop:
                         """Django for loop context"""
                         counter: int
@@ -180,7 +180,8 @@ class _DjangoForLoop:
                         first: bool
                         last: bool
                         parentloop: "_DjangoForLoop"
-                    '''))
+                    ''')
+            )
 
         for variable_name, variable in context.items():
             if variable.type:

djlsp/scripts/django-collector.py

@@ -573,7 +573,7 @@ def collect_for_wagtail(self):
                 if model.context_object_name:
                     self.templates[model.template]["context"][
                         model.context_object_name
-                    ] = (model.__module__ + "." + model.__name__)
+                    ] = model.__module__ + "." + model.__name__
 
 
 #######################################################################################
@@ -596,10 +596,12 @@ def get_default_django_settings_module():
 
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="""
+    parser = argparse.ArgumentParser(
+        description="""
             Collect django project information for LSP.
             pure python script that is runned in project environment for using django.
-        """)
+        """
+    )
     parser.add_argument("--django-settings-module", action="store", type=str)
     parser.add_argument("--project-src", action="store", type=str)
     args = parser.parse_args()

pyproject.toml

@@ -30,10 +30,7 @@ django-template-lsp = "djlsp.cli:main"
 [project.optional-dependencies]
 dev = [
     "tox",
-    "black",
-    "isort",
-    "flake8",
-    "flake8-pyproject",
+    "ruff",
     "pytest",
     "pytest-check",
     "pytest-cov",
@@ -52,12 +49,15 @@ include-package-data = false
 [tool.setuptools.packages.find]
 include = ["djlsp*"]
 
-[tool.isort]
-profile = "black"
-known_first_party = "djlsp"
-skip_glob = ["tests/django_test/env/*"]
+[tool.ruff]
+line-length = 88
+exclude = [
+    "tests/django_test/env",
+    ".venv",
+]
+
+[tool.ruff.lint]
+select = ["E", "F", "W", "I"]
 
-[tool.flake8]
-max-line-length = 88
-extend-ignore = "W503"
-exclude = "tests/django_test/env/"
+[tool.ruff.lint.isort]
+known-first-party = ["djlsp"]