Merge branch 'master' into hacky-debug-output

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system dependencies
-        run: sudo apt update && sudo apt install gettext unzip
+        run: sudo apt update && sudo apt install -y gettext unzip
       - name: Install Python dependencies
         run: pip3 install -U setuptools build pip check-manifest
       - name: Run check-manifest

.github/workflows/docs.yml

@@ -37,7 +37,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt update && sudo apt install enchant-2 hunspell aspell-en
+        run: sudo apt update && sudo apt install -y enchant-2 hunspell aspell-en
       - name: Install Dependencies
         run: pip3 install -Ur requirements.txt
         working-directory: ./doc

.github/workflows/strings.yml

@@ -35,7 +35,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system packages
-        run: sudo apt update && sudo apt install gettext
+        run: sudo apt update && sudo apt -y install gettext
       - name: Install Dependencies
         run: pip3 install uv && uv pip install --system -e ".[dev]"
       - name: Compile messages

.github/workflows/tests.yml

@@ -51,7 +51,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Install system dependencies
-        run: sudo apt update && sudo apt install gettext
+        run: sudo apt update && sudo apt install -y gettext
       - name: Install Python dependencies
         run: pip3 install uv && uv pip install --system -e ".[dev]" psycopg2-binary
       - name: Run checks

src/pretix/control/views/typeahead.py

@@ -156,7 +156,7 @@ def event_list(request):
         max_fromto=Greatest(Max('subevents__date_to'), Max('subevents__date_from'))
     ).annotate(
         order_from=Coalesce('min_from', 'date_from'),
-    ).order_by('-order_from')
+    ).order_by('-order_from', 'slug')
 
     total = qs.count()
     pagesize = 20
@@ -318,7 +318,7 @@ def nav_context_list(request):
         max_fromto=Greatest(Max('subevents__date_to'), Max('subevents__date_from'))
     ).annotate(
         order_from=Coalesce('min_from', 'date_from'),
-    ).order_by('-order_from')
+    ).order_by('-order_from', 'slug')
 
     if request.user.has_active_staff_session(request.session.session_key):
         qs_orga = Organizer.objects.all()

src/pretix/presale/views/organizer.py

@@ -210,7 +210,7 @@ class EventListMixin:
                 )
             ).annotate(
                 order_to=Coalesce('max_fromto', 'max_to', 'max_from', 'date_to', 'date_from'),
-            ).order_by('-order_to')
+            ).order_by('-order_to', 'name', 'slug')
         else:
             date_q = Q(date_to__gte=now()) | (Q(date_to__isnull=True) & Q(date_from__gte=now()))
             qs = qs.filter(
@@ -219,7 +219,7 @@ class EventListMixin:
                 )
             ).annotate(
                 order_from=Coalesce('min_from', 'date_from'),
-            ).order_by('order_from')
+            ).order_by('order_from', 'name', 'slug')
         qs = Event.annotated(filter_qs_by_attr(
             qs, self.request, match_subevents_with_conditions=Q(active=True) & Q(is_public=True) & date_q
         ), self.request.sales_channel)

src/pretix/testutils/mock.py

@@ -38,4 +38,9 @@ def mocker_context():
 
 
 def get_redis_connection(alias="default", write=True):
-    return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server("127.0.0.1:None:v(7, 0)", (7, 0)))
+    worker_id = os.environ.get("PYTEST_XDIST_WORKER")
+    if worker_id.startswith("gw"):
+        redis_port = 1000 + int(worker_id.replace("gw", ""))
+    else:
+        redis_port = 1000
+    return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server(f"127.0.0.1:{redis_port}:redis:v(7, 0)", (7, 0), server_type="redis"))

src/tests/api/test_order_change.py

@@ -451,7 +451,7 @@ def test_order_create_invoice(token_client, organizer, event, order):
         "invoice_to_vat_id": "DE123",
         "invoice_to_beneficiary": "",
         "custom_field": None,
-        'date': now().date().isoformat(),
+        'date': now().astimezone(event.timezone).date().isoformat(),
         'refers': None,
         'locale': 'en',
         'introductory_text': '',

src/tests/conftest.py

@@ -85,27 +85,32 @@ def reset_locale():
 
 @pytest.fixture
 def fakeredis_client(monkeypatch):
+    worker_id = os.environ.get("PYTEST_XDIST_WORKER")
+    if worker_id.startswith("gw"):
+        redis_port = 1000 + int(worker_id.replace("gw", ""))
+    else:
+        redis_port = 1000
     with override_settings(
         HAS_REDIS=True,
         REAL_CACHE_USED=True,
         CACHES={
             'redis': {
                 'BACKEND': 'django.core.cache.backends.redis.RedisCache',
-                'LOCATION': 'redis://127.0.0.1',
+                'LOCATION': f'redis://127.0.0.1:{redis_port}',
                 'OPTIONS': {
                     'connection_class': FakeConnection
                 }
             },
             'redis_session': {
                 'BACKEND': 'django.core.cache.backends.redis.RedisCache',
-                'LOCATION': 'redis://127.0.0.1',
+                'LOCATION': f'redis://127.0.0.1:{redis_port}',
                 'OPTIONS': {
                     'connection_class': FakeConnection
                 }
             },
             'default': {
                 'BACKEND': 'django.core.cache.backends.redis.RedisCache',
-                'LOCATION': 'redis://127.0.0.1',
+                'LOCATION': f'redis://127.0.0.1:{redis_port}',
                 'OPTIONS': {
                     'connection_class': FakeConnection
                 }