Update tests

Author: fsbraun

.github/workflows/test.yml

@@ -13,6 +13,7 @@ jobs:
           django-4.2.txt,
           django-5.0.txt,
           django-5.1.txt,
+          django-5.2.txt,
           django-main.txt,
         ]
         custom-image-model: [false, true]
@@ -24,12 +25,14 @@ jobs:
             python-version: 3.9
           - requirements-file: django-5.1.txt
             python-version: 3.9
+          - requirements-file: django-5.2.txt
+            python-version: 3.9
+          - requirements-file: django-main.txt
+            python-version: 3.9
           - requirements-file: django-main.txt
             python-version: 3.10
           - requirements-file: django-main.txt
             python-version: 3.11
-          - requirements-file: django-main.txt
-            python-version: 3.9
 
     steps:
     - uses: actions/checkout@v1

filer/admin/folderadmin.py

@@ -5,6 +5,7 @@
 from urllib.parse import quote as urlquote
 from urllib.parse import unquote as urlunquote
 
+from django import VERSION as DJANGO_VERSION
 from django import forms
 from django.conf import settings as django_settings
 from django.contrib import messages
@@ -777,9 +778,14 @@ def delete_files_or_folders(self, request, files_queryset, folders_queryset):
             n = files_queryset.count() + folders_queryset.count()
             if n:
                 # delete all explicitly selected files
-                for f in files_queryset:
-                    self.log_deletion(request, f, force_str(f))
-                    f.delete()
+                if DJANGO_VERSION >= (5,1):
+                    self.log_deletions(request, files_queryset)
+                    for f in files_queryset:
+                        f.delete()
+                else:
+                    for f in files_queryset:
+                        self.log_deletion(request, f, force_str(f))
+                        f.delete()
                 # delete all files in all selected folders and their children
                 # This would happen automatically by ways of the delete
                 # cascade, but then the individual .delete() methods won't be

tests/requirements/django-5.2.txt

@@ -0,0 +1,4 @@
+-r base.txt
+
+django>=5.2a1,<5.3
+django_polymorphic>=3.1

tox.ini

@@ -4,13 +4,15 @@ envlist =
     isort
     docs
     frontend
-    py{310,311,312}-{dj42,dj50,djmain}-{swap,noswap}
+    py{310,311,312}-{dj42,dj50,dj51,dj52}-{swap,noswap}
+    py{312,313,312}-{djmain}-{swap,noswap}
 
 [gh-actions]
 python =
     3.10: py310
     3.11: py311
     3.12: py312
+    3.13: py313
 
 skip_missing_interpreters=True
 
@@ -21,11 +23,13 @@ allowlist_externals =
 deps =
     dj42: -r tests/requirements/django-4.2.txt
     dj50: -r tests/requirements/django-5.0.txt
+    dj51: -r tests/requirements/django-5.1.txt
+    dj52: -r tests/requirements/django-5.2.txt
     djmain: -r tests/requirements/django-main.txt
 commands =
     {envpython} --version
     {env:COMMAND:coverage} erase
-    {env:COMMAND:coverage} run setup.py test
+    {env:COMMAND:coverage} run tests/settings.py
     {env:COMMAND:coverage} report
 setenv =
     swap: CUSTOM_IMAGE=custom_image.Image