DRF 3.15 compatibility

modoboa/admin/api/v2/tests.py

@@ -523,7 +523,7 @@ class UserAccountViewSetTestCase(ModoAPITestCase):
 
     def test_forward(self):
         self.client.credentials(HTTP_AUTHORIZATION="Token " + self.da_token.key)
-        url = reverse("v2:account-forward")
+        url = reverse("v2:user_account-forward")
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
         self.assertNotIn("recipients", resp.json())

modoboa/admin/api/v2/urls.py

@@ -17,7 +17,7 @@ router.register(
     r"senderaddresses", v1_viewsets.SenderAddressViewSet, basename="sender_address"
 )
 router.register(r"identities", viewsets.IdentityViewSet, basename="identities")
-router.register(r"account", viewsets.UserAccountViewSet, basename="account")
+router.register(r"account", viewsets.UserAccountViewSet, basename="user_account")
 router.register(r"alarms", viewsets.AlarmViewSet, basename="alarm")
 
 urlpatterns = router.urls

modoboa/postfix_autoreply/api/v2/tests.py

@@ -156,12 +156,14 @@ class AccountARMessageViewSetTestCase(ModoAPITestCase):
         self.client.logout()
         self.client.force_login(self.account)
         url = reverse("api:account_armessage-armessage")
+        fromdate = timezone.now()
+        todate = fromdate + relativedelta(days=4)
         data = {
             "enabled": True,
             "subject": "Je suis absent",
             "content": "Je reviendrai",
-            "fromdate": "2024-03-16T10:00",
-            "untildate": "2024-03-18T10:00",
+            "fromdate": fromdate.isoformat(),
+            "untildate": todate.isoformat(),
         }
         response = self.client.put(url, data, format="json")
         self.assertEqual(response.status_code, 200)

requirements.txt

@@ -9,7 +9,7 @@ django-rename-app==0.1.7
 
 dj-database-url
 
-djangorestframework>=3.14,<3.15
+djangorestframework>=3.14,<3.16
 drf-spectacular
 uritemplate
 djangorestframework-simplejwt==5.3.1