diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f3949f05..8aa4493f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,13 +13,8 @@ repos: hooks: - id: flake8 - - repo: https://github.com/asottile/yesqa - rev: v1.5.0 - hooks: - - id: yesqa - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: check-merge-conflict - id: check-toml @@ -38,8 +33,8 @@ repos: args: [--target-version, "3.2"] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.13 - hooks: # Format before linting + rev: v0.12.9 + hooks: - id: ruff-check # - id: ruff-format diff --git a/django_celery_beat/apps.py b/django_celery_beat/apps.py index 65084ef2..6531028f 100644 --- a/django_celery_beat/apps.py +++ b/django_celery_beat/apps.py @@ -14,5 +14,5 @@ class BeatConfig(AppConfig): default_auto_field = 'django.db.models.AutoField' def ready(self): - from .signals import signals_connect + from .signals import signals_connect # noqa: PLC0415 signals_connect() diff --git a/django_celery_beat/clockedschedule.py b/django_celery_beat/clockedschedule.py index 93bf98ac..b4abcff3 100644 --- a/django_celery_beat/clockedschedule.py +++ b/django_celery_beat/clockedschedule.py @@ -6,7 +6,7 @@ from .utils import NEVER_CHECK_TIMEOUT -class clocked(schedules.BaseSchedule): +class clocked(schedules.BaseSchedule): # noqa: PLW1641 """clocked schedule. Depends on PeriodicTask one_off=True diff --git a/django_celery_beat/signals.py b/django_celery_beat/signals.py index 65a4d769..99a734eb 100644 --- a/django_celery_beat/signals.py +++ b/django_celery_beat/signals.py @@ -3,10 +3,11 @@ def signals_connect(): """Connect to signals.""" - from django.db.models import signals + from django.db.models import signals # noqa: PLC0415 - from .models import (ClockedSchedule, CrontabSchedule, IntervalSchedule, - PeriodicTask, PeriodicTasks, SolarSchedule) + from .models import (ClockedSchedule, CrontabSchedule, # noqa: PLC0415 + IntervalSchedule, PeriodicTask, PeriodicTasks, + SolarSchedule) signals.pre_save.connect( PeriodicTasks.changed, sender=PeriodicTask diff --git a/django_celery_beat/tzcrontab.py b/django_celery_beat/tzcrontab.py index dbca7e2d..36319198 100644 --- a/django_celery_beat/tzcrontab.py +++ b/django_celery_beat/tzcrontab.py @@ -7,7 +7,7 @@ schedstate = namedtuple('schedstate', ('is_due', 'next')) -class TzAwareCrontab(schedules.crontab): +class TzAwareCrontab(schedules.crontab): # noqa: PLW1641 """Timezone Aware Crontab.""" def __init__( diff --git a/django_celery_beat/utils.py b/django_celery_beat/utils.py index 7ef8bf73..e75bc719 100644 --- a/django_celery_beat/utils.py +++ b/django_celery_beat/utils.py @@ -57,9 +57,9 @@ def is_database_scheduler(scheduler): """Return true if Celery is configured to use the db scheduler.""" if not scheduler: return False - from kombu.utils import symbol_by_name + from kombu.utils import symbol_by_name # noqa: PLC0415 - from .schedulers import DatabaseScheduler + from .schedulers import DatabaseScheduler # noqa: PLC0415 return ( scheduler == 'django' or issubclass(symbol_by_name(scheduler), DatabaseScheduler) diff --git a/t/unit/conftest.py b/t/unit/conftest.py index e84c564f..82fd2524 100644 --- a/t/unit/conftest.py +++ b/t/unit/conftest.py @@ -18,7 +18,8 @@ @pytest.fixture(scope='session', autouse=True) def setup_default_app_trap(): - from celery._state import set_default_app + from celery._state import set_default_app # noqa: PLC0415 + set_default_app(Trap()) diff --git a/t/unit/test_schedulers.py b/t/unit/test_schedulers.py index f7dfac8b..e8b398a9 100644 --- a/t/unit/test_schedulers.py +++ b/t/unit/test_schedulers.py @@ -1229,7 +1229,6 @@ def test_crontab_special_hour_four(self): @patch('django.utils.timezone.get_current_timezone') def test_crontab_timezone_conversion(self, mock_get_tz, mock_aware_now): # Set up mocks for server timezone and current time - from datetime import datetime server_tz = ZoneInfo("Asia/Tokyo") mock_get_tz.return_value = server_tz @@ -1306,8 +1305,6 @@ def test_crontab_timezone_conversion_with_negative_offset_and_dst( self, mock_aware_now, mock_get_tz ): # Set up mocks for server timezone and current time - from datetime import datetime - server_tz = ZoneInfo("UTC") mock_get_tz.return_value = server_tz