Skip to content

Commit 5d8e6ec

Browse files
cunlacunla
committed
ruff
1 parent 3debe11 commit 5d8e6ec

File tree

5 files changed

+30
-31
lines changed

5 files changed

+30
-31
lines changed

‎scheduler/helpers/callback.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def __init__(self, func: Union[str, Callable[..., Any]], timeout: Optional[int]
2222
try:
2323
func_str = func
2424
func = callable_func(func)
25-
except (TypeError, AttributeError, ModuleNotFoundError, ValueError) as e:
25+
except (TypeError, AttributeError, ModuleNotFoundError, ValueError):
2626
raise CallbackSetupError(f"Callback `func` is not callable: {func_str}")
2727
self.func: Callable[..., Any] = func
2828

‎scheduler/helpers/queues/getters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import List, Set
1+
from typing import Set
22

33
from scheduler.redis_models.worker import WorkerModel
44
from scheduler.settings import (

‎scheduler/tests/test_mgmt_commands/test_scheduler_stats.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from scheduler import settings
1010
from scheduler.helpers.queues import get_queue
11-
from scheduler.worker.worker import get_queues
1211

1312

1413
@override_settings(SCHEDULER_QUEUES=dict(default={"HOST": "localhost", "PORT": 6379, "DB": 0}))

‎scheduler/tests/test_task_types/test_task_model.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ def test_function_string(self):
270270
def test_admin_list_view(self):
271271
# arrange
272272
self.client.login(username="admin", password="admin")
273-
task = task_factory(self.task_type)
274-
url = reverse(f"admin:scheduler_task_changelist")
273+
task_factory(self.task_type)
274+
url = reverse("admin:scheduler_task_changelist")
275275
# act
276276
res = self.client.get(url)
277277
# assert
@@ -283,7 +283,7 @@ def test_admin_list_view_delete_model(self):
283283
task = task_factory(
284284
self.task_type,
285285
)
286-
url = reverse(f"admin:scheduler_task_changelist")
286+
url = reverse("admin:scheduler_task_changelist")
287287
# act
288288
res = self.client.post(
289289
url,
@@ -301,7 +301,7 @@ def test_admin_run_job_now_enqueues_job_at(self):
301301
# arrange
302302
self.client.login(username="admin", password="admin")
303303
task = task_factory(self.task_type)
304-
url = reverse(f"admin:scheduler_task_changelist")
304+
url = reverse("admin:scheduler_task_changelist")
305305
# act
306306
res = self.client.post(
307307
url,
@@ -326,7 +326,7 @@ def test_admin_change_view(self):
326326
self.task_type,
327327
)
328328
url = reverse(
329-
f"admin:scheduler_task_change",
329+
"admin:scheduler_task_change",
330330
args=[
331331
task.pk,
332332
],
@@ -342,7 +342,7 @@ def test_admin_change_view__bad_redis_connection(self):
342342
task = task_factory(self.task_type, queue="test2", instance_only=True)
343343
task.save(schedule_job=False)
344344
url = reverse(
345-
f"admin:scheduler_task_change",
345+
"admin:scheduler_task_change",
346346
args=[
347347
task.pk,
348348
],
@@ -401,7 +401,7 @@ def test_admin_enable_job(self):
401401
task.id,
402402
],
403403
}
404-
url = reverse(f"admin:scheduler_task_changelist")
404+
url = reverse("admin:scheduler_task_changelist")
405405
# act
406406
res = self.client.post(url, data=data, follow=True)
407407
# assert
@@ -422,7 +422,7 @@ def test_admin_disable_job(self):
422422
task.id,
423423
],
424424
}
425-
url = reverse(f"admin:scheduler_task_changelist")
425+
url = reverse("admin:scheduler_task_changelist")
426426
self.assertTrue(task.is_scheduled())
427427
# act
428428
res = self.client.post(url, data=data, follow=True)
@@ -466,7 +466,7 @@ def test_admin_delete_selected(self):
466466
],
467467
"post": "yes",
468468
}
469-
url = reverse(f"admin:scheduler_task_changelist")
469+
url = reverse("admin:scheduler_task_changelist")
470470
# act
471471
res = self.client.post(url, data=data, follow=True)
472472
# assert

‎scheduler/worker/worker.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,18 @@ def from_model(cls, model: WorkerModel) -> Self:
109109
return res
110110

111111
def __init__(
112-
self,
113-
queues,
114-
name: str,
115-
connection: Optional[ConnectionType] = None,
116-
maintenance_interval: int = SCHEDULER_CONFIG.DEFAULT_MAINTENANCE_TASK_INTERVAL,
117-
job_monitoring_interval=SCHEDULER_CONFIG.DEFAULT_JOB_MONITORING_INTERVAL,
118-
dequeue_strategy: DequeueStrategy = DequeueStrategy.DEFAULT,
119-
disable_default_exception_handler: bool = False,
120-
fork_job_execution: bool = True,
121-
with_scheduler: bool = True,
122-
burst: bool = False,
123-
model: Optional[WorkerModel] = None,
112+
self,
113+
queues,
114+
name: str,
115+
connection: Optional[ConnectionType] = None,
116+
maintenance_interval: int = SCHEDULER_CONFIG.DEFAULT_MAINTENANCE_TASK_INTERVAL,
117+
job_monitoring_interval=SCHEDULER_CONFIG.DEFAULT_JOB_MONITORING_INTERVAL,
118+
dequeue_strategy: DequeueStrategy = DequeueStrategy.DEFAULT,
119+
disable_default_exception_handler: bool = False,
120+
fork_job_execution: bool = True,
121+
with_scheduler: bool = True,
122+
burst: bool = False,
123+
model: Optional[WorkerModel] = None,
124124
): # noqa
125125
self.fork_job_execution = fork_job_execution
126126
self.job_monitoring_interval = job_monitoring_interval
@@ -212,9 +212,9 @@ def _install_signal_handlers(self) -> None:
212212
signal.signal(signal.SIGTERM, self.request_stop)
213213

214214
def work(
215-
self,
216-
max_jobs: Optional[int] = None,
217-
max_idle_time: Optional[int] = None,
215+
self,
216+
max_jobs: Optional[int] = None,
217+
max_idle_time: Optional[int] = None,
218218
) -> bool:
219219
"""Starts the work loop.
220220
@@ -389,7 +389,7 @@ def run_maintenance_tasks(self):
389389
self._model.save(connection=self.connection)
390390

391391
def dequeue_job_and_maintain_ttl(
392-
self, timeout: Optional[int], max_idle_time: Optional[int] = None
392+
self, timeout: Optional[int], max_idle_time: Optional[int] = None
393393
) -> Tuple[JobModel, Queue]:
394394
"""Dequeues a job while maintaining the TTL.
395395
:param timeout: The timeout for the dequeue operation.
@@ -564,7 +564,7 @@ def reorder_queues(self, reference_queue: Queue):
564564
return
565565
if self._dequeue_strategy == DequeueStrategy.ROUND_ROBIN:
566566
pos = self._ordered_queues.index(reference_queue)
567-
self._ordered_queues = self._ordered_queues[pos + 1:] + self._ordered_queues[: pos + 1]
567+
self._ordered_queues = self._ordered_queues[pos + 1 :] + self._ordered_queues[: pos + 1]
568568
return
569569
if self._dequeue_strategy == DequeueStrategy.RANDOM:
570570
shuffle(self._ordered_queues)
@@ -648,7 +648,7 @@ def monitor_job_execution_process(self, job: JobModel, queue: Queue) -> None:
648648
while True:
649649
try:
650650
with SCHEDULER_CONFIG.DEATH_PENALTY_CLASS(
651-
self.job_monitoring_interval, JobExecutionMonitorTimeoutException
651+
self.job_monitoring_interval, JobExecutionMonitorTimeoutException
652652
):
653653
retpid, ret_val, rusage = self.wait_for_job_execution_process()
654654
break
@@ -884,7 +884,7 @@ class RoundRobinWorker(Worker):
884884

885885
def reorder_queues(self, reference_queue):
886886
pos = self._ordered_queues.index(reference_queue)
887-
self._ordered_queues = self._ordered_queues[pos + 1:] + self._ordered_queues[: pos + 1]
887+
self._ordered_queues = self._ordered_queues[pos + 1 :] + self._ordered_queues[: pos + 1]
888888

889889

890890
class RandomWorker(Worker):

0 commit comments

Comments
 (0)