Version Bump 4.6.1

Cron Offset Fix

See merge request allianceauth/allianceauth!1678

allianceauth/__init__.py

@@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '4.6.0'
+__version__ = '4.6.1'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/crontab/migrations/0001_initial.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.16 on 2025-01-20 06:16
+
+import allianceauth.crontab.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CronOffset',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('minute', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Minute Offset')),
+                ('hour', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Hour Offset')),
+                ('day_of_month', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Month Offset')),
+                ('month_of_year', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Month of Year Offset')),
+                ('day_of_week', models.FloatField(default=allianceauth.crontab.models.random_default, verbose_name='Day of Week Offset')),
+            ],
+            options={
+                'verbose_name': 'Cron Offsets',
+            },
+        ),
+    ]

allianceauth/crontab/utils.py

@@ -19,8 +19,17 @@ def offset_cron(schedule: crontab) -> crontab:
 
     try:
         cron_offset = CronOffset.get_solo()
-        new_minute = [(m + (round(60 * cron_offset.minute))) % 60 for m in schedule.minute]
-        new_hour = [(m + (round(24 * cron_offset.hour))) % 24 for m in schedule.hour]
+
+        # Stops this shit from happening 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+        # It is only cosmetic, but still annoying
+        if schedule._orig_minute == '*':
+            new_minute = '*'
+        else:
+            new_minute = [(m + (round(60 * cron_offset.minute))) % 60 for m in schedule.minute]
+        if schedule._orig_hour == '*':
+            new_hour = '*'
+        else:
+            new_hour = [(m + (round(24 * cron_offset.hour))) % 24 for m in schedule.hour]
 
         return crontab(
             minute=",".join(str(m) for m in sorted(new_minute)),

docker/.env.example

@@ -1,7 +1,7 @@
 PROTOCOL=https://
 AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN%
 DOMAIN=%DOMAIN%
-AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.6.0
+AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.6.1
 
 # Nginx Proxy Manager
 PROXY_HTTP_PORT=80

docker/Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.11-slim
-ARG AUTH_VERSION=v4.6.0
+ARG AUTH_VERSION=v4.6.1
 ARG AUTH_PACKAGE=allianceauth==${AUTH_VERSION}
 ENV AUTH_USER=allianceauth
 ENV AUTH_GROUP=allianceauth