Reformat Python code with Ruff (#537)

* Reformat Python code with Ruff

Author: hongquan

.github/workflows/deploy.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Build documentation
         run: |
-          source .venv/bin/activate
+          source ${GITHUB_WORKSPACE}/.venv/bin/activate
           make html
         working-directory: doc  # Adjust to your Sphinx docs directory
 

.github/workflows/docs.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Spellcheck docs
         run: |
-          source .venv/bin/activate
+          source ${GITHUB_WORKSPACE}/.venv/bin/activate
           make spelling
         working-directory: ./doc
 

.github/workflows/tests.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Compile
         working-directory: ./src
         run: |
-          source .venv/bin/activate
+          source ${GITHUB_WORKSPACE}/.venv/bin/activate
           make all compress
       - name: Run tests
         working-directory: ./src

.gitignore

@@ -18,18 +18,20 @@ htmlcov/
 .ropeproject
 __pycache__/
 .cache
+
 _static/
 static.dist/
+src/pretix/static/jsi18n/
 build/
 _build/
 dist/
-pretix/static/jsi18n/
 node_modules/
 .idea
 .secret
 atlassian-ide-plugin.xml
 pretixeu/
 local/
+
 .project
 .pydevproject
 .DS_Store

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.9.1
+  rev: v0.9.4
   hooks:
     - id: ruff
     - id: ruff-format

pyproject.toml

@@ -109,7 +109,7 @@ dependencies = [
 memcached = ['pylibmc']
 
 [dependency-groups]
-lint = ['djlint>=1.36.4', 'ruff>=0.9.1']
+lint = ['djlint>=1.36.4', 'ruff>=0.9.4']
 test = [
   'pytest-mock>=3.10.0',
   'pytest>=7.3.2',
@@ -201,6 +201,8 @@ dummy-variable-rgx = '^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$'
 # This file uses star import (`import *`) which is not recommended.
 'src/tests/settings.py' = ['F403', 'F405']
 'src/pretix/testutils/settings.py' = ['F403', 'F405']
+# These files are index of models, we can ignore "imported but unused".
+'src/**/models/__init__.py' = ['F401']
 
 [tool.ruff.format]
 quote-style = 'single'

src/manage.py

@@ -2,8 +2,8 @@
 import os
 import sys
 
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings")
+if __name__ == '__main__':
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pretix.settings')
 
     from django.core.management import execute_from_command_line
 

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "3.18.0.dev0"
+__version__ = '3.18.0.dev0'

src/pretix/__main__.py

@@ -1,8 +1,8 @@
 import os
 import sys
 
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings")
+if __name__ == '__main__':
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pretix.settings')
 
     from django.core.management import execute_from_command_line
 

src/pretix/api/auth/device.py

@@ -4,7 +4,8 @@
 from rest_framework.authentication import TokenAuthentication
 
 from pretix.api.auth.devicesecurity import (
-    DEVICE_SECURITY_PROFILES, FullAccessSecurityProfile,
+    DEVICE_SECURITY_PROFILES,
+    FullAccessSecurityProfile,
 )
 from pretix.base.models import Device
 

src/pretix/api/auth/devicesecurity.py

@@ -13,7 +13,7 @@ class AllowListSecurityProfile:
     allowlist = ()
 
     def is_allowed(self, request):
-        key = (request.method, f"{request.resolver_match.namespace}:{request.resolver_match.url_name}")
+        key = (request.method, f'{request.resolver_match.namespace}:{request.resolver_match.url_name}')
         return key in self.allowlist
 
 
@@ -127,7 +127,8 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
 
 
 DEVICE_SECURITY_PROFILES = {
-    k.identifier: k() for k in (
+    k.identifier: k()
+    for k in (
         FullAccessSecurityProfile,
         PretixScanSecurityProfile,
         PretixScanNoSyncSecurityProfile,

src/pretix/api/auth/permission.py

@@ -5,12 +5,13 @@
 from pretix.base.models.auth import SuperuserPermissionSet
 from pretix.base.models.organizer import TeamAPIToken
 from pretix.helpers.security import (
-    SessionInvalid, SessionReauthRequired, assert_session_valid,
+    SessionInvalid,
+    SessionReauthRequired,
+    assert_session_valid,
 )
 
 
 class EventPermission(BasePermission):
-
     def has_permission(self, request, view):
         if not request.user.is_authenticated and not isinstance(request.auth, (Device, TeamAPIToken)):
             return False
@@ -31,13 +32,16 @@ def has_permission(self, request, view):
             except SessionReauthRequired:
                 return False
 
-        perm_holder = (request.auth if isinstance(request.auth, (Device, TeamAPIToken))
-                       else request.user)
+        perm_holder = request.auth if isinstance(request.auth, (Device, TeamAPIToken)) else request.user
         if 'event' in request.resolver_match.kwargs and 'organizer' in request.resolver_match.kwargs:
-            request.event = Event.objects.filter(
-                slug=request.resolver_match.kwargs['event'],
-                organizer__slug=request.resolver_match.kwargs['organizer'],
-            ).select_related('organizer').first()
+            request.event = (
+                Event.objects.filter(
+                    slug=request.resolver_match.kwargs['event'],
+                    organizer__slug=request.resolver_match.kwargs['organizer'],
+                )
+                .select_related('organizer')
+                .first()
+            )
             if not request.event or not perm_holder.has_event_permission(request.event.organizer, request.event, request=request):
                 return False
             request.organizer = request.event.organizer
@@ -87,15 +91,13 @@ def has_permission(self, request, view):
             return False
         elif view.action == 'destroy' and 'can_change_event_settings' not in request.eventpermset:
             return False
-        elif view.action in ['update', 'partial_update'] \
-                and 'can_change_event_settings' not in request.eventpermset:
+        elif view.action in ['update', 'partial_update'] and 'can_change_event_settings' not in request.eventpermset:
             return False
 
         return True
 
 
 class ProfilePermission(BasePermission):
-
     def has_permission(self, request, view):
         if not request.user.is_authenticated and not isinstance(request.auth, (Device, TeamAPIToken)):
             return False
@@ -117,7 +119,6 @@ def has_permission(self, request, view):
 
 
 class AnyAuthenticatedClientPermission(BasePermission):
-
     def has_permission(self, request, view):
         if not request.user.is_authenticated and not isinstance(request.auth, (Device, TeamAPIToken)):
             return False

src/pretix/api/exception.py

@@ -9,11 +9,7 @@ def custom_exception_handler(exc, context):
 
     if isinstance(exc, LockTimeoutException):
         response = Response(
-            {'detail': 'The server was too busy to process your request. Please try again.'},
-            status=status.HTTP_409_CONFLICT,
-            headers={
-                'Retry-After': 5
-            }
+            {'detail': 'The server was too busy to process your request. Please try again.'}, status=status.HTTP_409_CONFLICT, headers={'Retry-After': 5}
         )
 
     return response

src/pretix/api/middleware.py

@@ -27,10 +27,7 @@ def __call__(self, request: HttpRequest):
         if not request.headers.get('X-Idempotency-Key'):
             return self.get_response(request)
 
-        auth_hash_parts = '{}:{}'.format(
-            request.headers.get('Authorization', ''),
-            request.COOKIES.get(settings.SESSION_COOKIE_NAME, '')
-        )
+        auth_hash_parts = '{}:{}'.format(request.headers.get('Authorization', ''), request.COOKIES.get(settings.SESSION_COOKIE_NAME, ''))
         auth_hash = sha1(auth_hash_parts.encode()).hexdigest()
         idempotency_key = request.headers.get('X-Idempotency-Key', '')
 
@@ -44,8 +41,8 @@ def __call__(self, request: HttpRequest):
                     'request_path': request.path,
                     'response_code': 0,
                     'response_headers': '{}',
-                    'response_body': b''
-                }
+                    'response_body': b'',
+                },
             )
 
         if created:
@@ -70,8 +67,7 @@ def __call__(self, request: HttpRequest):
                         call.response_body = repr(resp).encode()
                     call.response_headers = json.dumps(resp.headers._store)
                     call.locked = None
-                    call.save(update_fields=['locked', 'response_code', 'response_headers',
-                                             'response_body'])
+                    call.save(update_fields=['locked', 'response_code', 'response_headers', 'response_body'])
             return resp
         else:
             if call.locked:

src/pretix/api/migrations/0001_initial.py

@@ -8,11 +8,9 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(

src/pretix/api/migrations/0002_initial.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
@@ -29,7 +28,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='oauthrefreshtoken',
             name='access_token',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='refresh_token', to=settings.OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL),
+            field=models.OneToOneField(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='refresh_token', to=settings.OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL
+            ),
         ),
         migrations.AddField(
             model_name='oauthrefreshtoken',
@@ -54,7 +55,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='oauthidtoken',
             name='user',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s', to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s', to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
             model_name='oauthgrant',
@@ -74,7 +77,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='oauthapplication',
             name='user',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s', to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s', to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
             model_name='oauthaccesstoken',
@@ -84,7 +89,9 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='oauthaccesstoken',
             name='id_token',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='access_token', to=settings.OAUTH2_PROVIDER_ID_TOKEN_MODEL),
+            field=models.OneToOneField(
+                null=True, on_delete=django.db.models.deletion.CASCADE, related_name='access_token', to=settings.OAUTH2_PROVIDER_ID_TOKEN_MODEL
+            ),
         ),
         migrations.AddField(
             model_name='oauthaccesstoken',
@@ -94,12 +101,16 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='oauthaccesstoken',
             name='source_refresh_token',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='refreshed_access_token', to=settings.OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL),
+            field=models.OneToOneField(
+                null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='refreshed_access_token', to=settings.OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL
+            ),
         ),
         migrations.AddField(
             model_name='oauthaccesstoken',
             name='user',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s', to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s', to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AlterUniqueTogether(
             name='apicall',

src/pretix/api/migrations/0004_oauthapplication_allowed_origins_and_more.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('pretixapi', '0003_oauthapplication_post_logout_redirect_uris_and_more'),
     ]