@W-14603959 - moving django back to 4 LTS version and address reiew c…

…omments

metecho/api/models.py

@@ -716,9 +716,10 @@ def __str__(self):
         return self.name
 
     def save(self, *args, **kwargs):
-        obj = super().save(*args, **kwargs)
+        if not self.id:
+            super().save(*args, **kwargs)
         self.update_status()
-        return obj
+        return super().save()
 
     def subscribable_by(self, user):  # pragma: nocover
         return True

metecho/api/tests/admin.py

@@ -42,7 +42,7 @@ def test_queryset__deleted(self, epic_factory):
 
         args = (
             None,
-            {"deleted_at": ["true"]},
+            {"deleted_at": "true"},
             None,
             None,
         )

metecho/oauth2/salesforce/tests/provider.py

@@ -1,29 +1,25 @@
 from ..provider import CustomSalesforceProvider
-from allauth.socialaccount.models import SocialApp
 import pytest
 
 
-@pytest.fixture
-def dummy():
-    app = SocialApp.objects.create(
-        provider=CustomSalesforceProvider.id,
-        name=CustomSalesforceProvider.id,
-        client_id="app123id",
-        key=CustomSalesforceProvider.id,
-        secret="dummy",)
-    return app
-
-
 @pytest.mark.django_db
-def test_get_auth_params(rf, dummy):
+def test_get_auth_params(rf, social_app_factory):
     request = rf.get("/")
-    result = CustomSalesforceProvider(request, dummy).get_auth_params(request, None)
+    app = social_app_factory(
+        name=CustomSalesforceProvider.id,
+        provider=CustomSalesforceProvider.id,
+    )
+    result = CustomSalesforceProvider(request, app).get_auth_params(request, None)
     assert "prompt" in result and result["prompt"] == "login"
 
 
 @pytest.mark.django_db
-def test_extract_uid(rf):
+def test_extract_uid(rf, social_app_factory):
     request = rf.get("/")
-    provider = CustomSalesforceProvider(request, dummy)
+    app = social_app_factory(
+        name=CustomSalesforceProvider.id,
+        provider=CustomSalesforceProvider.id,
+    )
+    provider = CustomSalesforceProvider(request, app)
     result = provider.extract_uid({"organization_id": "ORG", "user_id": "USER"})
     assert result == "ORG/USER"

requirements/dev.txt

@@ -62,7 +62,7 @@ daphne==4.0.0
     # via -r requirements/dev.in
 decorator==5.1.1
     # via ipython
-django==5.0
+django~=4.2.0
     # via
     #   -c requirements/prod.txt
     #   django-extensions

requirements/prod.txt

@@ -78,7 +78,7 @@ defusedxml==0.7.1
     #   python3-openid
 dj-database-url==2.1.0
     # via -r requirements/prod.in
-django==5.0
+django~=4.2.0
     # via
     #   -r requirements/prod.in
     #   channels