Bump arabic-reshaper from 3.0.0 to 3.0.1

Bumps [arabic-reshaper](https://github.com/mpcabd/python-arabic-reshaper) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/mpcabd/python-arabic-reshaper/releases)
- [Commits](https://github.com/mpcabd/python-arabic-reshaper/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: arabic-reshaper
  dependency-version: 3.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Dockerfile

@@ -31,7 +31,6 @@ RUN apt-get update && \
     mkdir /etc/pretix && \
     mkdir /data && \
     useradd -ms /bin/bash -d /pretix -u 15371 pretixuser && \
-    chmod 0755 /pretix \
     echo 'pretixuser ALL=(ALL) NOPASSWD:SETENV: /usr/bin/supervisord' >> /etc/sudoers && \
     mkdir /static && \
     mkdir /etc/supervisord

doc/api/resources/item_program_times.rst

@@ -16,7 +16,6 @@ Field                                 Type                       Description
 id                                    integer                    Internal ID of the program time
 start                                 datetime                   The start date time for this program time slot.
 end                                   datetime                   The end date time for this program time slot.
-location                              multi-lingual string       The program time slot's location (or ``null``)
 ===================================== ========================== =======================================================
 
 .. versionchanged:: TODO
@@ -55,20 +54,17 @@ Endpoints
             {
                "id": 2,
                "start": "2025-08-14T22:00:00Z",
-               "end": "2025-08-15T00:00:00Z",
-               "location": null
+               "end": "2025-08-15T00:00:00Z"
             },
             {
                "id": 3,
                "start": "2025-08-12T22:00:00Z",
-               "end": "2025-08-13T22:00:00Z",
-               "location": null
+               "end": "2025-08-13T22:00:00Z"
             },
             {
                "id": 14,
                "start": "2025-08-15T22:00:00Z",
-               "end": "2025-08-17T22:00:00Z",
-               "location": null
+               "end": "2025-08-17T22:00:00Z"
             }
         ]
       }
@@ -103,8 +99,7 @@ Endpoints
       {
          "id": 1,
          "start": "2025-08-15T22:00:00Z",
-         "end": "2025-10-27T23:00:00Z",
-         "location": null
+         "end": "2025-10-27T23:00:00Z"
       }
 
    :param organizer: The ``slug`` field of the organizer to fetch
@@ -130,8 +125,7 @@ Endpoints
 
       {
         "start": "2025-08-15T10:00:00Z",
-        "end": "2025-08-15T22:00:00Z",
-        "location": null
+        "end": "2025-08-15T22:00:00Z"
       }
 
    **Example response**:
@@ -145,8 +139,7 @@ Endpoints
       {
         "id": 17,
         "start": "2025-08-15T10:00:00Z",
-        "end": "2025-08-15T22:00:00Z",
-        "location": null
+        "end": "2025-08-15T22:00:00Z"
       }
 
    :param organizer: The ``slug`` field of the organizer of the event/item to create a program time for

pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "arabic-reshaper==3.0.0",  # Support for Arabic in reportlab
+  "arabic-reshaper==3.0.1",  # Support for Arabic in reportlab
   "babel",
   "BeautifulSoup4==4.14.*",
   "bleach==6.3.*",

src/pretix/api/serializers/item.py

@@ -191,7 +191,7 @@ class InlineItemAddOnSerializer(serializers.ModelSerializer):
 class InlineItemProgramTimeSerializer(serializers.ModelSerializer):
     class Meta:
         model = ItemProgramTime
-        fields = ('start', 'end', 'location')
+        fields = ('start', 'end')
 
 
 class ItemBundleSerializer(serializers.ModelSerializer):
@@ -222,7 +222,7 @@ class ItemBundleSerializer(serializers.ModelSerializer):
 class ItemProgramTimeSerializer(serializers.ModelSerializer):
     class Meta:
         model = ItemProgramTime
-        fields = ('id', 'start', 'end', 'location')
+        fields = ('id', 'start', 'end')
 
     def validate(self, data):
         data = super().validate(data)

src/pretix/api/serializers/order.py

@@ -1416,7 +1416,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         qa = QuotaAvailability()
         qa.queue(*[q for q, d in quota_diff_for_locking.items() if d > 0])
         qa.compute()
-        v_avail = {}
 
         # These are not technically correct as diff use due to the time offset applied above, so let's prevent accidental
         # use further down
@@ -1446,13 +1445,11 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
 
                 voucher_usage[v] += 1
                 if voucher_usage[v] > 0:
-                    if v not in v_avail:
-                        v.refresh_from_db(fields=['redeemed'])
-                        redeemed_in_carts = CartPosition.objects.filter(
-                            Q(voucher=v) & Q(event=self.context['event']) & Q(expires__gte=now_dt)
-                        ).exclude(pk__in=[cp.pk for cp in delete_cps])
-                        v_avail[v] = v.max_usages - v.redeemed - redeemed_in_carts.count()
-                    if v_avail[v] < voucher_usage[v]:
+                    redeemed_in_carts = CartPosition.objects.filter(
+                        Q(voucher=pos_data['voucher']) & Q(event=self.context['event']) & Q(expires__gte=now_dt)
+                    ).exclude(pk__in=[cp.pk for cp in delete_cps])
+                    v_avail = v.max_usages - v.redeemed - redeemed_in_carts.count()
+                    if v_avail < voucher_usage[v]:
                         errs[i]['voucher'] = [
                             'The voucher has already been used the maximum number of times.'
                         ]

src/pretix/base/migrations/0299_itemprogramtime_location.py

@@ -1,19 +0,0 @@
-# Generated by Django 4.2.27 on 2026-01-21 12:06
-
-import i18nfield.fields
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0298_pluggable_permissions"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="itemprogramtime",
-            name="location",
-            field=i18nfield.fields.I18nTextField(max_length=200, null=True),
-        )
-    ]

src/pretix/base/models/items.py

@@ -2306,17 +2306,10 @@ class ItemProgramTime(models.Model):
     :type start: datetime
     :param end: The date and time this program time ends
     :type end: datetime
-    :param location: venue
-    :type location: str
     """
     item = models.ForeignKey('Item', related_name='program_times', on_delete=models.CASCADE)
     start = models.DateTimeField(verbose_name=_("Start"))
     end = models.DateTimeField(verbose_name=_("End"))
-    location = I18nTextField(
-        null=True, blank=True,
-        max_length=200,
-        verbose_name=_("Location"),
-    )
 
     def clean(self):
         if hasattr(self, 'item') and self.item and self.item.event.has_subevents:

src/pretix/base/pdf.py

@@ -498,9 +498,9 @@ DEFAULT_VARIABLES = OrderedDict((
         ) if op.valid_until else ""
     }),
     ("program_times", {
-        "label": _("Program times"),
+        "label": _("Program times: date and time"),
         "editor_sample": _(
-            "2017-05-31 10:00 – 12:00, Room 1\n2017-05-31 14:00 – 16:00, Room 2\n2017-05-31 14:00 – 2017-06-01 14:00, Building A"),
+            "2017-05-31 10:00 – 12:00\n2017-05-31 14:00 – 16:00\n2017-05-31 14:00 – 2017-06-01 14:00"),
         "evaluate": lambda op, order, ev: get_program_times(op, ev)
     }),
     ("medium_identifier", {
@@ -748,19 +748,13 @@ def get_seat(op: OrderPosition):
 
 
 def get_program_times(op: OrderPosition, ev: Event):
-    ptstr = []
-    for pt in op.item.program_times.all():
-        ptstr.append([
-            datetimerange(
-                pt.start.astimezone(ev.timezone),
-                pt.end.astimezone(ev.timezone),
-                as_html=False
-            ),
-            (', ' + ', '.join(
-                l.strip() for l in str(pt.location).splitlines() if l.strip())
-             ) if str(pt.location).strip() else ''
-        ])
-    return '\n'.join(''.join(l) for l in ptstr)
+    return '\n'.join([
+        datetimerange(
+            pt.start.astimezone(ev.timezone),
+            pt.end.astimezone(ev.timezone),
+            as_html=False
+        ) for pt in op.item.program_times.all()
+    ])
 
 
 def generate_compressed_addon_list(op, order, event, only_checked_in=False):

src/pretix/base/services/orders.py

@@ -727,6 +727,8 @@ def _check_positions(event: Event, now_dt: datetime, time_machine_now_dt: dateti
     _check_date(event, time_machine_now_dt)
 
     products_seen = Counter()
+    q_avail = Counter()
+    v_avail = Counter()
     v_usages = Counter()
     v_budget = {}
     deleted_positions = set()
@@ -791,9 +793,6 @@ def _check_positions(event: Event, now_dt: datetime, time_machine_now_dt: dateti
                 shared_lock_objects=[event]
             )
 
-    q_avail = Counter()
-    v_avail = Counter()
-
     # Check maximum order size
     limit = min(int(event.settings.max_items_per_order), settings.PRETIX_MAX_ORDER_SIZE)
     if sum(1 for cp in sorted_positions if not cp.addon_to) > limit:

src/pretix/control/forms/item.py

@@ -574,7 +574,7 @@ class ItemCreateForm(I18nModelForm):
                 instance.bundles.create(bundled_item=b.bundled_item, bundled_variation=b.bundled_variation,
                                         count=b.count, designated_price=b.designated_price)
             for pt in self.cleaned_data['copy_from'].program_times.all():
-                instance.program_times.create(start=pt.start, end=pt.end, location=pt.location)
+                instance.program_times.create(start=pt.start, end=pt.end)
 
             item_copy_data.send(sender=self.event, source=self.cleaned_data['copy_from'], target=instance)
 
@@ -1354,10 +1354,6 @@ class ItemProgramTimeForm(I18nModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['end'].widget.attrs['data-date-after'] = '#id_{prefix}-start_0'.format(prefix=self.prefix)
-        self.fields['location'].widget.attrs['rows'] = '3'
-        self.fields['location'].widget.attrs['placeholder'] = _(
-            'Sample Conference Center, Heidelberg, Germany'
-        )
 
     class Meta:
         model = ItemProgramTime
@@ -1365,7 +1361,6 @@ class ItemProgramTimeForm(I18nModelForm):
         fields = [
             'start',
             'end',
-            'location'
         ]
         field_classes = {
             'start': forms.SplitDateTimeField,

src/pretix/control/templates/pretixcontrol/item/include_program_times.html

@@ -34,7 +34,6 @@
                     {% bootstrap_form_errors form %}
                     {% bootstrap_field form.start layout="control" %}
                     {% bootstrap_field form.end layout="control" %}
-                    {% bootstrap_field form.location layout="control" %}
                 </div>
             </div>
         {% endfor %}
@@ -60,7 +59,6 @@
                 <div class="panel-body form-horizontal">
                     {% bootstrap_field formset.empty_form.start layout="control" %}
                     {% bootstrap_field formset.empty_form.end layout="control" %}
-                    {% bootstrap_field formset.empty_form.location layout="control" %}
                 </div>
             </div>
         {% endescapescript %}

src/pretix/plugins/badges/exporters.py

@@ -57,7 +57,7 @@ from django.utils.translation import gettext as _, gettext_lazy, pgettext_lazy
 from pypdf import PageObject, PdfReader, PdfWriter, Transformation
 from pypdf.generic import RectangleObject
 from reportlab.lib import pagesizes
-from reportlab.lib.units import inch, mm
+from reportlab.lib.units import mm
 from reportlab.pdfgen import canvas
 
 from pretix.base.exporter import BaseExporter
@@ -133,14 +133,6 @@ OPTIONS = OrderedDict([
         'offsets': [66.1 * mm, 29.6 * mm],
         'pagesize': pagesizes.A4,
     }),
-    ('avery_4inx3in', {
-        'name': 'Avery 4" x 3" (74459)',
-        'cols': 2,
-        'rows': 3,
-        'margins': [1 * inch, .25 * inch, 1 * inch, .25 * inch],
-        'offsets': [4 * inch, 3 * inch],
-        'pagesize': pagesizes.LETTER,
-    }),
     ('avery_80x50', {
         'name': 'Avery Zweckform 80 x 50 mm (L4785)',
         'cols': 2,

src/pretix/plugins/badges/templates.py

@@ -22,7 +22,7 @@
 from django.utils.text import format_lazy
 from django.utils.translation import gettext_lazy as _
 from reportlab.lib import pagesizes
-from reportlab.lib.units import inch, mm
+from reportlab.lib.units import mm
 
 
 def _simple_template(w, h):
@@ -261,9 +261,4 @@ TEMPLATES = {
         "pagesize": (88.9 * mm, 33.87 * mm),
         "layout": _simple_template(88.9 * mm, 33.87 * mm),
     },
-    "4inx3in": {
-        "label": format_lazy(_("{width} x {height} inch label"), width=4, height=3),
-        "pagesize": (4 * inch, 3 * inch),
-        "layout": _simple_template(4 * inch, 3 * inch),
-    },
 }

src/pretix/presale/ical.py

@@ -153,7 +153,7 @@ def get_private_icals(event, positions):
                     # Actual ical organizer field is not useful since it will cause "your invitation was accepted" emails to the organizer
                     descr.append(_('Organizer: {organizer}').format(organizer=event.organizer.name))
                     description = '\n'.join(descr)
-                location = ", ".join(l.strip() for l in str(pt.location).splitlines() if l.strip())
+                location = None
                 dtstart = pt.start.astimezone(tz)
                 dtend = pt.end.astimezone(tz)
                 uid = 'pretix-{}-{}-{}-{}@{}'.format(

src/pretix/settings.py

@@ -265,7 +265,7 @@ EMAIL_USE_TLS = config.getboolean('mail', 'tls', fallback=False)
 EMAIL_USE_SSL = config.getboolean('mail', 'ssl', fallback=False)
 EMAIL_SUBJECT_PREFIX = '[pretix] '
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_CUSTOM_SMTP_BACKEND = 'pretix.base.email.CheckPrivateNetworkSmtpBackend'
+EMAIL_CUSTOM_SMTP_BACKEND = 'pretixbase.email.CheckPrivateNetworkSmtpBackend'
 EMAIL_TIMEOUT = 60
 
 ADMINS = [('Admin', n) for n in config.get('mail', 'admins', fallback='').split(",") if n]

src/tests/api/test_items.py

@@ -530,7 +530,6 @@ def test_item_detail_program_times(token_client, organizer, event, team, item, c
     res["program_times"] = [{
         "start": "2017-12-27T00:00:00Z",
         "end": "2017-12-28T00:00:00Z",
-        "location": None
     }]
     resp = token_client.get('/api/v1/organizers/{}/events/{}/items/{}/'.format(organizer.slug, event.slug,
                                                                                item.pk))
@@ -1973,54 +1972,32 @@ def program_time2(item, category):
                                      end=datetime(2017, 12, 30, 0, 0, 0, tzinfo=timezone.utc))
 
 
-@pytest.fixture
-def program_time3(item, category):
-    return item.program_times.create(start=datetime(2017, 12, 30, 0, 0, 0, tzinfo=timezone.utc),
-                                     end=datetime(2017, 12, 31, 0, 0, 0, tzinfo=timezone.utc),
-                                     location='Testlocation')
-
-
 TEST_PROGRAM_TIMES_RES = {
     0: {
         "start": "2017-12-27T00:00:00Z",
         "end": "2017-12-28T00:00:00Z",
-        "location": None,
     },
     1: {
         "start": "2017-12-29T00:00:00Z",
         "end": "2017-12-30T00:00:00Z",
-        "location": None,
-    },
-    2: {
-        "start": "2017-12-30T00:00:00Z",
-        "end": "2017-12-31T00:00:00Z",
-        "location": {"en": "Testlocation"},
     }
 }
 
 
 @pytest.mark.django_db
-def test_program_times_list(token_client, organizer, event, item, program_time, program_time2, program_time3):
+def test_program_times_list(token_client, organizer, event, item, program_time, program_time2):
     res = dict(TEST_PROGRAM_TIMES_RES)
     res[0]["id"] = program_time.pk
     res[1]["id"] = program_time2.pk
-    res[2]["id"] = program_time3.pk
     resp = token_client.get('/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug,
                                                                                              item.pk))
     assert resp.status_code == 200
     assert res[0]['start'] == resp.data['results'][0]['start']
     assert res[0]['end'] == resp.data['results'][0]['end']
     assert res[0]['id'] == resp.data['results'][0]['id']
-    assert res[0] == resp.data['results'][0]
     assert res[1]['start'] == resp.data['results'][1]['start']
     assert res[1]['end'] == resp.data['results'][1]['end']
     assert res[1]['id'] == resp.data['results'][1]['id']
-    assert res[1] == resp.data['results'][1]
-    assert res[2]['start'] == resp.data['results'][2]['start']
-    assert res[2]['end'] == resp.data['results'][2]['end']
-    assert res[2]['location'] == resp.data['results'][2]['location']
-    assert res[2]['id'] == resp.data['results'][2]['id']
-    assert res[2] == resp.data['results'][2]
 
 
 @pytest.mark.django_db
@@ -2062,59 +2039,6 @@ def test_program_times_create(token_client, organizer, event, item):
     assert resp.content.decode() == '{"non_field_errors":["The program end must not be before the program start."]}'
 
 
-@pytest.mark.django_db
-def test_program_times_create_location(token_client, organizer, event, item):
-    resp = token_client.post(
-        '/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug, item.pk),
-        {
-            "start": "2017-12-27T00:00:00Z",
-            "end": "2017-12-28T00:00:00Z",
-            "location": {
-                "en": "Testlocation",
-                "de": "Testort"
-            }
-        },
-        format='json'
-    )
-    assert resp.status_code == 201
-    with scopes_disabled():
-        program_time = ItemProgramTime.objects.get(pk=resp.data['id'])
-    assert "Testlocation" == program_time.location.localize("en")
-    assert "Testort" == program_time.location.localize("de")
-
-
-@pytest.mark.django_db
-def test_program_times_create_without_location(token_client, organizer, event, item):
-    resp = token_client.post(
-        '/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug, item.pk),
-        {
-            "start": "2017-12-27T00:00:00Z",
-            "end": "2017-12-28T00:00:00Z"
-        },
-        format='json'
-    )
-    assert resp.status_code == 201
-    assert resp.data['location'] is None
-    with scopes_disabled():
-        program_time = ItemProgramTime.objects.get(pk=resp.data['id'])
-    assert str(program_time.location) == ""
-
-    resp = token_client.post(
-        '/api/v1/organizers/{}/events/{}/items/{}/program_times/'.format(organizer.slug, event.slug, item.pk),
-        {
-            "start": "2017-12-27T00:00:00Z",
-            "end": "2017-12-28T00:00:00Z",
-            "location": None
-        },
-        format='json'
-    )
-    assert resp.status_code == 201
-    assert resp.data['location'] is None
-    with scopes_disabled():
-        program_time = ItemProgramTime.objects.get(pk=resp.data['id'])
-    assert str(program_time.location) == ""
-
-
 @pytest.mark.django_db
 def test_program_times_update(token_client, organizer, event, item, program_time):
     resp = token_client.patch(

src/tests/base/test_event_clone.py

@@ -82,11 +82,7 @@ def test_full_clone_same_organizer():
     assert item1.meta_data
     ItemProgramTime.objects.create(item=item1,
                                    start=datetime.datetime(2017, 12, 27, 0, 0, 0, tzinfo=datetime.timezone.utc),
-                                   end=datetime.datetime(2017, 12, 28, 0, 0, 0, tzinfo=datetime.timezone.utc),
-                                   location={
-                                       "en": "Testlocation",
-                                       "de": "Testort"
-                                   })
+                                   end=datetime.datetime(2017, 12, 28, 0, 0, 0, tzinfo=datetime.timezone.utc))
     assert item1.program_times
     item2 = event.items.create(category=category, tax_rule=tax_rule, name="T-shirt", default_price=15,
                                hidden_if_item_available=item1)
@@ -173,7 +169,6 @@ def test_full_clone_same_organizer():
     assert copied_item1.meta_data == item1.meta_data
     assert copied_item1.program_times.first().start == item1.program_times.first().start
     assert copied_item1.program_times.first().end == item1.program_times.first().end
-    assert copied_item1.program_times.first().location == item1.program_times.first().location
     assert copied_item2.variations.get().meta_data == item2v.meta_data
     assert copied_item1.hidden_if_available == copied_q2
     assert copied_item1.grant_membership_type == membership_type

src/tests/control/test_items.py

@@ -692,8 +692,7 @@ class ItemsTest(ItemFormTest):
         self.item2.program_times.create(start=datetime.datetime(2017, 12, 27, 0, 0, 0,
                                                                 tzinfo=datetime.timezone.utc),
                                         end=datetime.datetime(2017, 12, 28, 0, 0, 0,
-                                                              tzinfo=datetime.timezone.utc),
-                                        location={"en": "Testlocation", "de": "Testort"})
+                                                              tzinfo=datetime.timezone.utc))
 
         doc = self.get_doc('/control/event/%s/%s/items/add?copy_from=%d' % (self.orga1.slug, self.event1.slug, self.item2.pk))
         data = extract_form_fields(doc.select("form")[0])
@@ -724,7 +723,6 @@ class ItemsTest(ItemFormTest):
             assert set([str(v.value) for v in i_new.variations.all()]) == set([str(v.value) for v in i_old.variations.all()])
             assert i_old.program_times.first().start == i_new.program_times.first().start
             assert i_old.program_times.first().end == i_new.program_times.first().end
-            assert i_old.program_times.first().location == i_new.program_times.first().location
 
     def test_add_to_existing_quota(self):
         with scopes_disabled():