fixed linting and add ruff

Author: eadwinCode

.github/workflows/test_full.yml

@@ -39,9 +39,7 @@ jobs:
         run: flit install --symlink
       - name: Black
         run: black --check ellar_jwt tests
-      - name: isort
-        run: isort --check ellar_jwt tests
-      - name: Flake8
-        run: flake8 ellar_jwt tests
+      - name: Linting check
+        run: ruff check ellar_jwt tests &  ruff check tests
       - name: mypy
         run: mypy ellar_jwt

Makefile

@@ -19,14 +19,14 @@ install-full: ## Install dependencies
 
 lint: ## Run code linters
 	black --check ellar_jwt tests
-	isort --check ellar_jwt tests
-	autoflake --remove-unused-variables --remove-unused-variables -r ellar_jwt tests
-	flake8 ellar_jwt tests
+	ruff check ellar_jwt
+	ruff check tests
 	mypy ellar_jwt
 
 fmt format: ## Run code formatters
 	black ellar_jwt tests
-	isort ellar_jwt tests
+	ruff check --fix ellar_jwt
+	ruff check --fix tests
 
 test: ## Run tests
 	pytest tests

ellar_jwt/module.py

@@ -6,6 +6,7 @@
 from ellar.core import Config, ModuleSetup
 from ellar.core.modules import DynamicModule, ModuleBase
 from ellar.di import ProviderConfig
+from pydantic import AnyHttpUrl
 
 from .schemas import JWTConfiguration
 from .services import JWTService
@@ -17,19 +18,19 @@ class JWTModule(ModuleBase, IModuleSetup):
     def setup(
         cls,
         signing_secret_key: str,
-        verifying_secret_key: t.Optional[str] = "",
+        verifying_secret_key: str = "",
         algorithm: str = "HS256",
-        audience: str = None,
-        issuer: str = None,
-        jwk_url: str = None,
+        audience: t.Optional[str] = None,
+        issuer: t.Optional[str] = None,
+        jwk_url: t.Optional[AnyHttpUrl] = None,
         leeway: t.Union[float, int, timedelta] = 0,
         jti: str = "jti",
-        lifetime: timedelta = None,
+        lifetime: t.Optional[timedelta] = None,
         json_encoder: t.Any = json.JSONEncoder,
     ) -> DynamicModule:
         configuration = JWTConfiguration(
             signing_secret_key=signing_secret_key,
-            algorithm=algorithm,
+            algorithm=algorithm,  # type: ignore[arg-type]
             audience=audience,
             issuer=issuer,
             jwk_url=jwk_url,

ellar_jwt/services.py

@@ -44,7 +44,9 @@ def get_verifying_key(self, token: t.Any) -> bytes:
 
         return self.jwt_config.verifying_secret_key.encode()
 
-    def sign(self, payload: dict, headers: t.Dict[str, t.Any] = None) -> str:
+    def sign(
+        self, payload: dict, headers: t.Optional[t.Dict[str, t.Any]] = None
+    ) -> str:
         """
         Returns an encoded token for the given payload dictionary.
         """
@@ -60,7 +62,7 @@ def sign(self, payload: dict, headers: t.Dict[str, t.Any] = None) -> str:
         )
 
     async def sign_async(
-        self, payload: dict, headers: t.Dict[str, t.Any] = None
+        self, payload: dict, headers: t.Optional[t.Dict[str, t.Any]] = None
     ) -> str:
         return await anyio.to_thread.run_sync(self.sign, payload, headers)
 

pyproject.toml

@@ -62,12 +62,32 @@ Homepage = "https://eadwincode.github.io/ellar-jwt/"
 test = [
     "pytest >= 7.1.3,<8.0.0",
     "pytest-cov >= 2.12.0,<5.0.0",
-    "mypy == 0.971",
-    "flake8 >= 3.8.3,<7.0.0",
+    "mypy == 1.4.1",
+    "ruff ==0.0.275",
     "black == 22.8.0",
-    "isort >=5.0.6,<6.0.0",
     "pytest-asyncio",
     "autoflake",
     "types-python-dateutil",
     "types-pytz"
 ]
+
+[tool.ruff]
+select = [
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # pyflakes
+    "I",  # isort
+    "C",  # flake8-comprehensions
+    "B",  # flake8-bugbear
+]
+ignore = [
+    "E501",  # line too long, handled by black
+    "B008",  # do not perform function calls in argument defaults
+    "C901",  # too complex
+]
+
+[tool.ruff.per-file-ignores]
+"__init__.py" = ["F401"]
+
+[tool.ruff.isort]
+known-third-party = ["ellar", "pydantic", "starlette"]

tests/test_module_options.py

@@ -30,15 +30,15 @@ def test_jwt_module_configuration_case_1():
 def test_jwt_module_configuration_case_2():
     tm = Test.create_test_module(
         modules=[JWTModule.register_setup()],
-        config_module=dict(
-            JWT_CONFIG=dict(
-                algorithm="HS256",
-                signing_secret_key="no_secret",
-                issuer="https://ellar.com",
-                lifetime=timedelta(minutes=30),
-                leeway=None,
-            )
-        ),
+        config_module={
+            "JWT_CONFIG": {
+                "algorithm": "HS256",
+                "signing_secret_key": "no_secret",
+                "issuer": "https://ellar.com",
+                "lifetime": timedelta(minutes=30),
+                "leeway": None,
+            }
+        },
     )
     jwt_service: JWTService = tm.get(JWTService)