deps: django upgrade to 4.0

adhocracy-plus/config/settings/base.py

@@ -182,7 +182,6 @@
 
 USE_I18N = True
 
-USE_L10N = True
 
 USE_TZ = True
 

adhocracy-plus/config/settings/dev.py

@@ -26,7 +26,7 @@
 if os.getenv("DATABASE") == "postgresql":
     DATABASES = {
         "default": {
-            "ENGINE": "django.db.backends.postgresql_psycopg2",
+            "ENGINE": "django.db.backends.postgresql",
             "NAME": "django",
             "USER": "django",
             "PASSWORD": "",

adhocracy-plus/config/settings/travis.py

@@ -2,7 +2,7 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": "django.db.backends.postgresql",
         "USER": "postgres",
         "NAME": "django",
         "TEST": {"NAME": "django_test"},

adhocracy-plus/config/urls.py

@@ -90,21 +90,21 @@
 urlpatterns = [
     # General platform urls
     re_path(r"^django-admin/", admin.site.urls),
-    re_path(r"^admin/", include("wagtail.admin.urls")),
-    re_path(r"^documents/", include(wagtaildocs_urls)),
-    re_path(r"^accounts/", include("allauth.urls")),
-    re_path(r"^account/", include("apps.account.urls")),
-    re_path(r"^profile/", include("apps.users.urls")),
-    re_path(r"^userdashboard/", include("apps.userdashboard.urls")),
-    re_path(r"^i18n/", include(i18n)),
+    path("admin/", include("wagtail.admin.urls")),
+    path("documents/", include(wagtaildocs_urls)),
+    path("accounts/", include("allauth.urls")),
+    path("account/", include("apps.account.urls")),
+    path("profile/", include("apps.users.urls")),
+    path("userdashboard/", include("apps.userdashboard.urls")),
+    path("i18n/", include(i18n)),
     # API urls
-    re_path(r"^api/", include(ct_router.urls)),
-    re_path(r"^api/", include(module_router.urls)),
-    re_path(r"^api/", include(orga_router.urls)),
-    re_path(r"^api/", include(likes_router.urls)),
-    re_path(r"^api/", include(comment_router.urls)),
-    re_path(r"^api/", include(moderation_router.urls)),
-    re_path(r"^api/", include(router.urls)),
+    path("api/", include(ct_router.urls)),
+    path("api/", include(module_router.urls)),
+    path("api/", include(orga_router.urls)),
+    path("api/", include(likes_router.urls)),
+    path("api/", include(comment_router.urls)),
+    path("api/", include(moderation_router.urls)),
+    path("api/", include(router.urls)),
     re_path(r"^api/login", obtain_auth_token, name="api-login"),
     re_path(r"^api/account/", AccountViewSet.as_view(), name="api-account"),
     re_path(
@@ -115,8 +115,8 @@
         never_cache(user_is_project_admin(ck_views.browse)),
         name="ckeditor_browse",
     ),
-    re_path(r"^components/$", contrib_views.ComponentLibraryView.as_view()),
-    re_path(r"^jsi18n/$", JavaScriptCatalog.as_view(), name="javascript-catalog"),
+    path("components/", contrib_views.ComponentLibraryView.as_view()),
+    path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"),
     re_path(
         r"^(?P<organisation_slug>[-\w_]+)/",
         include(
@@ -216,6 +216,6 @@
 
 # generic patterns at the very end
 urlpatterns += [
-    re_path(r"", include("apps.organisations.urls")),
-    re_path(r"", include("wagtail.urls")),
+    path("", include("apps.organisations.urls")),
+    path("", include("wagtail.urls")),
 ]

adhocracy-plus/templates/includes/userdashboard_mobile_toggle.html

@@ -29,7 +29,7 @@
     {% else %}
     <nav class="d-inline-block d-sm-none" aria-label="{% trans 'Dashboard' %}">
         <a href="{% url 'userdashboard-overview' %}"
-           class="tab {% ifequal view.menu_item 'overview' %}active{% endifequal %}">
+           class="tab {% if view.menu_item == 'overview' %}active{% endif %}">
 
             {% trans 'Overview' %}
         </a>

apps/account/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.account.apps.Config"

apps/actions/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.actions.apps.Config"

apps/activities/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.activities.apps.Config"

apps/budgeting/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.budgeting.apps.Config"

apps/captcha/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.captcha.apps.Config"

apps/cms/contacts/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.cms.contacts.apps.Config"

apps/cms/images/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.cms.images.apps.Config"

apps/cms/news/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.cms.news.apps.Config"

apps/cms/pages/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.cms.pages.apps.Config"

apps/cms/settings/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.cms.settings.apps.Config"

apps/cms/use_cases/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.cms.use_cases.apps.Config"

apps/contrib/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.contrib.apps.Config"

apps/dashboard/__init__.py

@@ -1,8 +1,6 @@
 from adhocracy4.dashboard import ProjectDashboard
 from adhocracy4.dashboard import components
 
-default_app_config = "apps.dashboard.apps.Config"
-
 
 class TypedProjectDashboard(ProjectDashboard):
     def get_project_components(self):

apps/debate/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.debate.apps.Config"

apps/documents/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.documents.apps.Config"

apps/exports/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.exports.apps.Config"

apps/ideas/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.ideas.apps.Config"

apps/interactiveevents/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.interactiveevents.apps.Config"

apps/mapideas/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.mapideas.apps.Config"

apps/maps/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.maps.apps.Config"

apps/moderatorfeedback/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.moderatorfeedback.apps.Config"

apps/moderatorremark/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.moderatorremark.apps.Config"

apps/newsletters/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.newsletters.apps.Config"

apps/notifications/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.notifications.apps.Config"

apps/offlineevents/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.offlineevents.apps.Config"

apps/organisations/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.organisations.apps.Config"

apps/polls/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.polls.apps.Config"

apps/projects/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.projects.apps.Config"

apps/projects/admin.py

@@ -5,20 +5,16 @@
 from adhocracy4.projects.admin import ProjectAdminForm
 
 
+@admin.action(description=_("archive"))
 def set_is_archived_true(modeladmin, request, queryset):
     queryset.update(is_archived=True)
 
 
-set_is_archived_true.short_description = _("archive")
-
-
+@admin.action(description=_("dearchive"))
 def set_is_archived_false(modeladmin, request, queryset):
     queryset.update(is_archived=False)
 
 
-set_is_archived_false.short_description = _("dearchive")
-
-
 class ProjectAdmin(admin.ModelAdmin):
     form = ProjectAdminForm
     list_display = ("__str__", "organisation", "is_draft", "is_archived", "created")

apps/topicprio/__init__.py

@@ -1 +0,0 @@
-default_app_config = "apps.topicprio.apps.Config"

apps/userdashboard/templates/a4_candy_userdashboard/base_userdashboard.html

@@ -7,7 +7,7 @@
         <div class="container">
             <nav class="d-none d-sm-inline-block" aria-label="{% trans 'My dashboard' %}">
                 <a href="{% url 'userdashboard-overview' %}"
-                   class="tab {% ifequal view.menu_item 'overview' %}active{% endifequal %}">
+                   class="tab {% if view.menu_item == 'overview' %}active{% endif %}">
 
                     {% trans 'Overview' %}
                 </a>

apps/users/__init__.py

@@ -1,8 +1,6 @@
 from django.contrib.auth.signals import user_logged_in
 from django.utils.translation import gettext_lazy as _
 
-default_app_config = "apps.users.apps.Config"
-
 USERNAME_REGEX = r"^[\w]+[ \w.@+-]*$"
 USERNAME_INVALID_MESSAGE = _(
     "Enter a valid username. This value may contain "

changelog/7637.md

@@ -0,0 +1,10 @@
+### Upgraded
+
+- Django from 3.2.20 to 4.0
+  - remove app label from `__init__.py` inside app directories
+  - replace `re_path` with `path` for included urls.
+  - remove `USE_L10N` in settings as it is now True by default
+  - replace `postgresql_psycopg2` with `postgresql` in DATABASE settings
+  - set admin fields description as decorators in ProjectAdminForm
+  - update a4 hash pointing to commit with django upgrade 4.0
+  - replace deprecated `ifequal` with `if .. == ..` expression

package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "5.15.4",
     "@maplibre/maplibre-gl-leaflet": "0.0.19",
-    "adhocracy4": "git+https://github.com/liqd/adhocracy4#7378cb6f161a79e5dd9b1d685b62502614fcd35f",
+    "adhocracy4": "git+https://github.com/liqd/adhocracy4#4bb259f6b7138d69343017a27cfbc4cd93424414",
     "autoprefixer": "10.4.14",
     "bootstrap": "5.2.3",
     "css-loader": "6.8.1",

requirements/base.txt

@@ -1,5 +1,5 @@
 # A4
-git+https://github.com/liqd/adhocracy4.git@7378cb6f161a79e5dd9b1d685b62502614fcd35f#egg=adhocracy4
+git+https://github.com/liqd/adhocracy4.git@4bb259f6b7138d69343017a27cfbc4cd93424414#egg=adhocracy4
 
 # Additional requirements
 brotli==1.0.9
@@ -15,7 +15,7 @@ urllib3==2.0.3
 redis==5.0.0
 
 # Inherited a4-core requirements
-Django==3.2.19
+Django== 4.0
 django-allauth==0.54.0
 git+https://github.com/liqd/django-autoslug.git@liqd2212#egg=django-autoslug
 django-ckeditor==6.5.1

tests/projects/test_serializers.py

@@ -1,6 +1,7 @@
+from datetime import timezone
+
 import pytest
 from dateutil.parser import parse
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from freezegun import freeze_time
 

tests/userdashboard/test_serializers.py

@@ -1,8 +1,8 @@
 from datetime import timedelta
+from datetime import timezone
 
 import pytest
 from django.urls import reverse
-from django.utils import timezone
 from freezegun import freeze_time
 
 from apps.contrib import dates