Merge pull request #427 from peopledoc/django3-compatibility

Django3 compatibility

Author: robincherbonnier

CHANGELOG.rst

@@ -8,6 +8,7 @@ master (unreleased)
 - Fix issues with postgresql on CI.
 - Replace deprecated yaml.load calls to fix doc build.
 - Add a default value `[]` to conditions.
+- Added support for Django 3
 
 Release 7.1.0 (2021-06-28)
 ==========================

demo/demo/builder/urls.py

@@ -1,17 +1,17 @@
-from django.conf.urls import url
+from django.urls import re_path
 from demo.builder import views
 
 urlpatterns = [
-    url(r'^$',
-        views.FormidableListView.as_view(),
-        name='formidable-list'),
-    url(r'^(?P<pk>\d+)/(?P<role>[-_\w]+)/$',
-        views.FormidableDetailView.as_view(),
-        name='formidable-detail'),
-    url(r'^edit/(?P<pk>\d+)$',
-        views.FormidableUpdateView.as_view(),
-        name='formidable-edit'),
-    url(r'^builder/(?P<pk>\d+)$',
-        views.FormidableBuilderView.as_view(),
-        name='formidable-builder'),
+    re_path(r'^$',
+            views.FormidableListView.as_view(),
+            name='formidable-list'),
+    re_path(r'^(?P<pk>\d+)/(?P<role>[-_\w]+)/$',
+            views.FormidableDetailView.as_view(),
+            name='formidable-detail'),
+    re_path(r'^edit/(?P<pk>\d+)$',
+            views.FormidableUpdateView.as_view(),
+            name='formidable-edit'),
+    re_path(r'^builder/(?P<pk>\d+)$',
+            views.FormidableBuilderView.as_view(),
+            name='formidable-builder'),
 ]

demo/demo/urls.py

@@ -1,17 +1,18 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.contrib import admin
-from django.urls import path
 
 from demo.views import FormPreview, DemoValidateViewFromSchema
 
+
 urlpatterns = [
-    url(r'^api/',
+    re_path(
+        r'^api/',
         include(('formidable.urls', 'formidable'), namespace='formidable')),
-    url(r'^api/forms/(?P<pk>\d+)/validate_schema/?$',
-        DemoValidateViewFromSchema.as_view(),
-        name='form_validation_schema'),
-    url(r'^preview/(?P<pk>\d+)/', FormPreview.as_view()),
-    url(r'^forms/',
-        include(('demo.builder.urls', 'builder'), namespace='builder')),
-    path(r'admin/', admin.site.urls, 'admin'),
+    re_path(r'^api/forms/(?P<pk>\d+)/validate_schema/?$',
+            DemoValidateViewFromSchema.as_view(),
+            name='form_validation_schema'),
+    re_path(r'^preview/(?P<pk>\d+)/', FormPreview.as_view()),
+    re_path(r'^forms/',
+            include(('demo.builder.urls', 'builder'), namespace='builder')),
+    re_path(r'admin/', admin.site.urls, 'admin'),
 ]

demo/tests/perfs/test_integration.perf.yml

@@ -1,14 +1,28 @@
 UpdateFormTestCase.test_queryset_on_context_form_detail:
+- db: 'SELECT ... FROM "django_session" WHERE ("django_session"."expire_date" > # AND "django_session"."session_key" = #) LIMIT #'
+- db: 'SELECT ... FROM "formidable_formidable" WHERE "formidable_formidable"."id" = # LIMIT #'
+- db: 'SELECT ... FROM "formidable_field" WHERE "formidable_field"."form_id" = # ORDER BY "formidable_field"."order" ASC'
+UpdateFormTestCase.test_queryset_on_context_form_detail-pg:
+- db: 'SELECT ... FROM "django_session" WHERE ("django_session"."expire_date" > #::timestamptz AND "django_session"."session_key" = #) LIMIT #'
+- db: 'SELECT ... FROM "formidable_formidable" WHERE "formidable_formidable"."id" = # LIMIT #'
+- db: 'SELECT ... FROM "formidable_field" WHERE "formidable_field"."form_id" = # ORDER BY "formidable_field"."order" ASC'
+UpdateFormTestCase.test_queryset_on_context_form_detail-django2:
 - db: 'SELECT ... FROM "django_session" WHERE ("django_session"."expire_date" > # AND "django_session"."session_key" = #)'
 - db: 'SELECT ... FROM "formidable_formidable" WHERE "formidable_formidable"."id" = #'
 - db: 'SELECT ... FROM "formidable_field" WHERE "formidable_field"."form_id" = # ORDER BY "formidable_field"."order" ASC'
-UpdateFormTestCase.test_queryset_on_context_form_detail-pg:
+UpdateFormTestCase.test_queryset_on_context_form_detail-pg-django2:
 - db: 'SELECT ... FROM "django_session" WHERE ("django_session"."expire_date" > #::timestamptz AND "django_session"."session_key" = #)'
 - db: 'SELECT ... FROM "formidable_formidable" WHERE "formidable_formidable"."id" = #'
 - db: 'SELECT ... FROM "formidable_field" WHERE "formidable_field"."form_id" = # ORDER BY "formidable_field"."order" ASC'
 UpdateFormTestCase.test_queryset_on_get:
+- db: 'SELECT ... FROM "formidable_formidable" WHERE "formidable_formidable"."id" = # LIMIT #'
+- db: 'SELECT ... FROM "formidable_field" WHERE "formidable_field"."form_id" = # ORDER BY "formidable_field"."order" ASC'
+UpdateFormTestCase.test_queryset_on_get-django2:
 - db: 'SELECT ... FROM "formidable_formidable" WHERE "formidable_formidable"."id" = #'
 - db: 'SELECT ... FROM "formidable_field" WHERE "formidable_field"."form_id" = # ORDER BY "formidable_field"."order" ASC'
 UpdateFormTestCase.test_queryset_on_get-pg:
+- db: 'SELECT ... FROM "formidable_formidable" WHERE "formidable_formidable"."id" = # LIMIT #'
+- db: 'SELECT ... FROM "formidable_field" WHERE "formidable_field"."form_id" = # ORDER BY "formidable_field"."order" ASC'
+UpdateFormTestCase.test_queryset_on_get-pg-django2:
 - db: 'SELECT ... FROM "formidable_formidable" WHERE "formidable_formidable"."id" = #'
 - db: 'SELECT ... FROM "formidable_field" WHERE "formidable_field"."form_id" = # ORDER BY "formidable_field"."order" ASC'