Django 4 support (#223)

The following changes were made:

* Add Django 4 to CI
* Fix test loader
* Remove deprecated argument
* Migrate urls to re_paths
* Use method_decorator
* Remove varying exception message checks
* Migrate assertEquals
* Remove timezones from times
* Migrate JSONField
* Update setup.py

Author: Gergely

.github/workflows/ci.yml

@@ -8,8 +8,8 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.7", "3.8"]
-        django-version: ["3.1.4"]
+        python-version: ["3.8", "3.12"]
+        django-version: ["3.2.25", "4.2.11"]
         database-engine: ["postgres", "mysql"]
 
     services:

binder/history.py

@@ -11,7 +11,7 @@
 from .json import jsondumps, JsonResponse
 
 
-transaction_commit = Signal(providing_args=['changeset'])
+transaction_commit = Signal()
 
 
 class Changeset(models.Model):

binder/models.py

@@ -11,7 +11,7 @@
 from django import forms
 from django.db import models
 from django.db.models.fields.files import FieldFile, FileField
-from django.contrib.postgres.fields import CITextField, ArrayField, JSONField, DateTimeRangeField as DTRangeField
+from django.contrib.postgres.fields import CITextField, ArrayField, DateTimeRangeField as DTRangeField
 from django.core import checks
 from django.core.files.base import File, ContentFile
 from django.core.files.images import ImageFile
@@ -395,7 +395,7 @@ def clean_value(self, qualifier, v):
 
 
 class JSONFieldFilter(FieldFilter):
-	fields = [JSONField]
+	fields = [models.JSONField]
 	# TODO: Element or path-based lookup is not supported yet
 	allowed_qualifiers = [None, 'contains', 'contained_by', 'has_key', 'has_any_keys', 'has_keys', 'isnull']
 

binder/plugins/my_filters/migrations/0002_migrate_jsonfield.py

@@ -0,0 +1,16 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('my_filters', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='MyFilter',
+            name='params',
+            field=models.JSONField(),
+        ),
+    ]

binder/plugins/my_filters/models.py

@@ -1,5 +1,4 @@
 from django.db import models
-from django.contrib.postgres.fields import JSONField
 from django.conf import settings
 
 from ...models import BinderModel
@@ -13,7 +12,7 @@ class MyFilter(BinderModel):
     )
     view = models.TextField()
     name = models.TextField()
-    params = JSONField()
+    params = models.JSONField()
     default = models.BooleanField(default=False)
 
     class Meta(BinderModel.Meta):

binder/plugins/views/userview.py

@@ -290,7 +290,7 @@ def reset_request(self, request):
 
 		return HttpResponse(status=204)
 
-	@never_cache
+	@method_decorator(never_cache)
 	@list_route(name='send_activation_email', unauthenticated=True)
 	@no_scoping_required()
 	def send_activation_email(self, request):
@@ -355,7 +355,7 @@ def send_activation_email(self, request):
 		return response
 
 	@method_decorator(sensitive_post_parameters())
-	@never_cache
+	@method_decorator(never_cache)
 	@detail_route(name='activate', unauthenticated=True)
 	@no_scoping_required()
 	def activate(self, request, pk=None):
@@ -406,7 +406,7 @@ def activate(self, request, pk=None):
 		return self.respond_with_user(request, user.id)
 
 	@method_decorator(sensitive_post_parameters())
-	@never_cache
+	@method_decorator(never_cache)
 	@detail_route(name='reset_password', unauthenticated=True, methods=['PUT'])
 	@no_scoping_required()
 	def reset_password(self, request, pk=None):
@@ -466,7 +466,7 @@ def _reset_pass_for_user(self, request, user_id, token, password):
 		return self.respond_with_user(request, user.id)
 
 	@method_decorator(sensitive_post_parameters())
-	@never_cache
+	@method_decorator(never_cache)
 	@list_route(name='change_password')
 	@no_scoping_required()
 	def change_password(self, request):

binder/tests_discoverer.py

@@ -1,5 +1,12 @@
-from django.test.runner import is_discoverable
 from django.apps import apps
+try:
+    from django.test.runner import is_discoverable
+except ImportError:
+    # Django 4 support
+    from django.test.runner import try_importing
+    def is_discoverable(path):
+        is_importable, _ = try_importing(path)
+        return is_importable
 
 # This prevents discoverer from loading models and views, which will
 # cause all sorts of random failures.

ci-requirements.txt

@@ -1,4 +1,4 @@
-psycopg2<2.9
+psycopg2<3.0
 mysqlclient
 Pillow
 django-request-id

docs/install.md

@@ -24,7 +24,7 @@ CSRF_FAILURE_VIEW = 'binder.router.csrf_failure'
 In `urls.py`, add the following:
 
 ```python
-from django.conf.urls import url, include
+from django.urls import re_path, include
 
 import binder.router
 import binder.views
@@ -33,8 +33,8 @@ import binder.models
 router = binder.router.Router().register(binder.views.ModelView)
 
 urlpatterns = [
-	url(r'^', include(router.urls)),
-	url(r'^', binder.views.api_catchall, name='catchall'),
+	re_path(r'^', include(router.urls)),
+	re_path(r'^', binder.views.api_catchall, name='catchall'),
 ]
 
 binder.models.install_history_signal_handlers(binder.models.BinderModel)

project/project/urls.py

@@ -1,9 +1,9 @@
-from django.conf.urls import url, include
+from django.urls import re_path, include
 from django.contrib import admin
 
 import testapp.urls
 
 urlpatterns = [
-	url(r'^admin/', admin.site.urls, name='admin'),
-	url(r'^api/', include(testapp.urls), name='testapp'),
+	re_path(r'^admin/', admin.site.urls, name='admin'),
+	re_path(r'^api/', include(testapp.urls), name='testapp'),
 ]