Merge branch 'master' into workflow

fossasia · Nov 4, 2024 · 6802a29 · 6802a29
2 parents 5a89ef9 + fcbea7d
commit 6802a29
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/exhibitors/migrations/0001_initial.py b/exhibitors/migrations/0001_initial.py
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('pretixbase', '0004_create_customer_table'),
+        ('pretixbase', '0001_initial'),
     ]
 
     operations = [

diff --git a/exhibitors/migrations/0002_alter_exhibitorinfo_lead_scanning_enabled_and_more.py b/exhibitors/migrations/0002_alter_exhibitorinfo_lead_scanning_enabled_and_more.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('pretixbase', '0004_create_customer_table'),
+        ('pretixbase', '0001_initial'),
         ('exhibitors', '0001_initial'),
     ]
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,5 @@
 import pytest
+
 from django.utils.timezone import now
 from pretix.base.models import Event, Organizer
 

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -1,4 +1,5 @@
 import pytest
+
 from django.core.files.uploadedfile import SimpleUploadedFile
 
 from exhibitors.models import ExhibitorInfo