From isort to ruff

Author: kasimlyee

.github/workflows/tests.yml

@@ -73,11 +73,8 @@ jobs:
       - name: Run black (code formatting check)
         run: black --check jsweb Tests
 
-      - name: Run isort (import sorting check)
-        run: isort --check-only jsweb Tests
-
-      - name: Run flake8 (linting)
-        run: flake8 jsweb Tests
+      - name: Run Ruff (lint & import check)
+        run: ruff check jsweb Tests
 
       - name: Run mypy (type checking)
         run: mypy jsweb --ignore-missing-imports --no-error-summary 2>/dev/null || true

Tests/conftest.py

@@ -1,8 +1,8 @@
 """Pytest configuration and shared fixtures for jsweb tests."""
 
+import sys
 from io import BytesIO
 from pathlib import Path
-import sys
 
 import pytest
 
@@ -128,7 +128,7 @@ def file_upload_environ(fake_environ):
         f"\r\n"
         f"test file content\r\n"
         f"--{boundary}--\r\n"
-    ).encode("utf-8")
+    ).encode()
 
     return fake_environ(
         method="POST",

Tests/test_features.py

@@ -1,7 +1,7 @@
 """Tests for new JsWeb features (JSON parsing, file uploads, validators)."""
 
-from io import BytesIO
 import json
+from io import BytesIO
 
 import pytest
 

Tests/test_performance.py

@@ -86,7 +86,8 @@ def handler(req):
 def test_starlette_routing_performance():
     """Benchmark Starlette routing performance (if available)."""
     try:
-        from starlette.routing import Route, Router as StarletteRouter
+        from starlette.routing import Route
+        from starlette.routing import Router as StarletteRouter
     except ImportError:
         pytest.skip("Starlette not installed")
 

Tests/test_request_response.py

@@ -1,7 +1,7 @@
 """Tests for JsWeb request and response handling."""
 
-from io import BytesIO
 import json
+from io import BytesIO
 
 import pytest
 
@@ -376,7 +376,7 @@ def test_response_string_conversion():
     from jsweb.response import Response
 
     response = Response("Test content")
-    response_str = str(response)
+    _response_str = str(response)
 
     assert response is not None
 

Tests/test_routing.py

@@ -257,7 +257,7 @@ def test_dynamic_route_performance():
     # Add 10 dynamic routes
     for i in range(10):
         router.add_route(
-            f"/users/<int:user_id>/posts/<int:post_id>",
+            "/users/<int:user_id>/posts/<int:post_id>",
             lambda req: "OK",
             endpoint=f"user_post_{i}",
         )

jsweb/app.py

@@ -97,7 +97,7 @@ async def _asgi_app_handler(self, scope, receive, send):
             response = JSONResponse({"error": str(e)}, status_code=405)
             await response(scope, receive, send)
             return
-        except Exception as e:
+        except Exception:
             response = JSONResponse({"error": "Internal Server Error"}, status_code=500)
             await response(scope, receive, send)
             return

jsweb/blueprints.py

@@ -1,4 +1,4 @@
-from typing import Callable, List, Optional, Tuple
+from collections.abc import Callable
 
 
 class Blueprint:
@@ -13,9 +13,9 @@ class Blueprint:
     def __init__(
         self,
         name: str,
-        url_prefix: Optional[str] = None,
-        static_folder: Optional[str] = None,
-        static_url_path: Optional[str] = None,
+        url_prefix: str | None = None,
+        static_folder: str | None = None,
+        static_url_path: str | None = None,
     ):
         """
         Initializes a new Blueprint.
@@ -32,16 +32,16 @@ def __init__(
         """
         self.name = name
         self.url_prefix = url_prefix
-        self.routes: List[Tuple[str, Callable, List[str], str]] = []
+        self.routes: list[tuple[str, Callable, list[str], str]] = []
         self.static_folder = static_folder
         self.static_url_path = static_url_path
 
     def add_route(
         self,
         path: str,
         handler: Callable,
-        methods: Optional[List[str]] = None,
-        endpoint: Optional[str] = None,
+        methods: list[str] | None = None,
+        endpoint: str | None = None,
     ):
         """
         Programmatically adds a route to the blueprint.
@@ -67,8 +67,8 @@ def add_route(
     def route(
         self,
         path: str,
-        methods: Optional[List[str]] = None,
-        endpoint: Optional[str] = None,
+        methods: list[str] | None = None,
+        endpoint: str | None = None,
     ) -> Callable:
         """
         A decorator to register a view function for a given path within the blueprint.

jsweb/cli.py

@@ -135,7 +135,7 @@ def create_project(name):
         ),
     }
     for src, dest in text_files_to_copy.items():
-        with open(src, "r", encoding="utf-8") as f_src:
+        with open(src, encoding="utf-8") as f_src:
             content = f_src.read()
         with open(dest, "w", encoding="utf-8") as f_dest:
             f_dest.write(content)
@@ -596,7 +596,7 @@ def cli():
                 logger.info(f"💬 Auto-generated message: {message}")
 
             command.revision(alembic_cfg, autogenerate=True, message=message)
-            logger.info(f"✅ Migration script prepared.")
+            logger.info("✅ Migration script prepared.")
 
         elif args.subcommand == "upgrade":
             command.upgrade(alembic_cfg, "head")

jsweb/docs/auto_validation.py

@@ -6,13 +6,11 @@
 """
 
 from functools import wraps
-import inspect
-from typing import Type, get_type_hints
 
 from pydantic import ValidationError as PydanticValidationError
 
 
-def validate_request_body(dto_class: Type):
+def validate_request_body(dto_class: type):
     """
     Decorator that automatically validates request body against a DTO.
 
@@ -84,7 +82,7 @@ async def wrapper(req, *args, **kwargs):
     return decorator
 
 
-def auto_serialize_response(dto_class: Type, status_code: int = 200):
+def auto_serialize_response(dto_class: type, status_code: int = 200):
     """
     Decorator that automatically serializes DTO responses to JSON.