Merge pull request #722 from SUNET/ylle-misc-cleanup

miscellaneous  cleanup and fixes

Makefile

@@ -86,8 +86,8 @@ vscode_venv:
 
 vscode_pip: vscode_venv
 	$(info Installing pip packages in devcontainer)
-	.venv/bin/pip install --upgrade pip
-	.venv/bin/pip install -r requirements/test_requirements.txt
+	.venv/bin/pip install uv
+	.venv/bin/uv pip install -r requirements/test_requirements.txt
 	.venv/bin/mypy --install-types
 
 # This target is used by the devcontainer.json to configure the devcontainer

requirements/test_requirements.in

@@ -4,8 +4,6 @@
 -r satosa_scim_requirements.in
 -r webapp_requirements.in
 -r worker_requirements.in
-black
-isort
 mock
 mypy
 pip-tools

ruff.toml

@@ -3,10 +3,9 @@ line-length = 120
 target-version = "py311"
 
 [lint]
-select = ["E", "F", "W", "I", "ASYNC", "UP", "FLY", "PERF", "FURB", "ERA", "ANN", "PIE"]
+select = ["E", "F", "W", "I", "ASYNC", "UP", "FLY", "PERF", "FURB", "ERA", "ANN", "PIE", "PL"]
 
-# ANN101 and ANN102 are depracated
-ignore = ["E501", "ANN1"]
+ignore = ["E501", "PLR", "PLW"]
 
 [lint.flake8-annotations]
 allow-star-arg-any = true

src/eduid/queue/workers/base.py

@@ -58,7 +58,7 @@ async def run(self) -> None:
         main_task = asyncio.create_task(self.run_subtasks(), name="run subtasks")
         # set up signal handling to be a well behaved service
         loop = asyncio.get_running_loop()
-        for signame in {"SIGINT", "SIGTERM"}:
+        for signame in ("SIGINT", "SIGTERM"):
             loop.add_signal_handler(getattr(signal, signame), functools.partial(cancel_task, signame, main_task))
 
         logger.info(f"Running: {main_task.get_name()}")

src/eduid/workers/job_runner/scheduler.py

@@ -1,7 +1,7 @@
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
 from eduid.common.config.exceptions import BadConfiguration
-from eduid.workers.job_runner.config import EnvironmentOrWorkerName, JobCronConfig
+from eduid.workers.job_runner.config import EnvironmentOrWorkerName, JobCronConfig, JobName
 from eduid.workers.job_runner.context import Context
 from eduid.workers.job_runner.jobs.skv import check_skv_users, gather_skv_users
 
@@ -22,7 +22,7 @@ def schedule_jobs(self, context: Context) -> None:
         jobs_config = context.config.jobs
         context.logger.debug(f"jobs_config: {jobs_config}")
 
-        jobs: dict = {}
+        jobs: dict[JobName, JobCronConfig] = {}
 
         # Gather jobs for current environment and worker in a dictionary
         if environment in jobs_config:
@@ -42,8 +42,7 @@ def schedule_jobs(self, context: Context) -> None:
         context.logger.info(f"Setting up jobs {jobs} for {worker_name} running {environment}")
 
         # Add all configured jobs to the scheduler
-        for job in jobs:
-            cron_settings: JobCronConfig = jobs[job]
+        for job, cron_settings in jobs.items():
             params = cron_settings.model_dump()
             context.logger.info(f"Setting up job {job} with parameters {params}")