From 081f8cbceea049923784e4f3db47082a20849adf Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sun, 18 Feb 2024 22:21:04 +0000
Subject: [PATCH] get ready for django 5

---
 atlas/urls.py                                |  2 +-
 longs/models.py                              | 21 +++++++++-----------
 rad/api.py                                   |  2 +-
 rcr/tests/{test_urls.py => test_rcr_urls.py} |  0
 requirements.txt                             |  6 +++---
 rota/urls.py                                 |  2 +-
 6 files changed, 15 insertions(+), 18 deletions(-)
 rename rcr/tests/{test_urls.py => test_rcr_urls.py} (100%)

diff --git a/atlas/urls.py b/atlas/urls.py
index 3ae5bd71..a7315e6a 100755
--- a/atlas/urls.py
+++ b/atlas/urls.py
@@ -232,7 +232,7 @@ urlpatterns = [
         name="series_order_dicom",
     ),
     path(
-        "images/<diff",
+        "images/diff",
         views.image_diff,
         name="image_diff",
     ),
diff --git a/longs/models.py b/longs/models.py
index 970883b2..12836d5d 100644
--- a/longs/models.py
+++ b/longs/models.py
@@ -19,8 +19,6 @@ from django.utils.html import mark_safe
 
 from django.core.exceptions import ValidationError
 
-from sortedm2m.fields import SortedManyToManyField
-
 import string
 from collections import defaultdict
 from helpers.images import image_as_base64, pretty_print_dicom
@@ -129,7 +127,6 @@ class Long(QuestionBase):
         default=1, help_text="Auto incrementing json creation number"
     )
 
-    #series = SortedManyToManyField("LongSeries", related_name="long")
     series = models.ManyToManyField("LongSeries", through="SeriesDetail", related_name="long")
 
     # question_file = models.FileField(upload_to=question_file_directory_path, blank=True, null=True)
@@ -609,15 +606,15 @@ class UserAnswer(UserAnswerBase):
 
     class ScoreOptions(models.TextChoices):
         UNMARKED = "", _("Unmarked")
-        FOUR = 4, _("4")
-        FOUR_HALF = 4.5, _("4.5")
-        FIVE = 5, _("5")
-        FIVE_HALF = 5.5, _("5.5")
-        SIX = 6, _("6")
-        SIX_HALF = 6.5, _("6.5")
-        SEVEN = 7, _("7")
-        SEVEN_HALF = 7.5, _("7.5")
-        EIGHT = 8, _("8")
+        FOUR = "4", _("4")
+        FOUR_HALF = "4.5", _("4.5")
+        FIVE = "5", _("5")
+        FIVE_HALF = "5.5", _("5.5")
+        SIX = "6", _("6")
+        SIX_HALF = "6.5", _("6.5")
+        SEVEN = "7", _("7")
+        SEVEN_HALF = "7.5", _("7.5")
+        EIGHT = "8", _("8")
 
     score = models.CharField(
         max_length=3,
diff --git a/rad/api.py b/rad/api.py
index 3e901f7f..588f5486 100644
--- a/rad/api.py
+++ b/rad/api.py
@@ -7,7 +7,7 @@ from sbas.api import router as sbas_router
 from physics.api import router as physics_router
 from atlas.api import router as atlas_router
 
-api = NinjaAPI(csrf=True, version="1")
+api = NinjaAPI(version="1")
 
 
 
diff --git a/rcr/tests/test_urls.py b/rcr/tests/test_rcr_urls.py
similarity index 100%
rename from rcr/tests/test_urls.py
rename to rcr/tests/test_rcr_urls.py
diff --git a/requirements.txt b/requirements.txt
index 31d8492a..318a407d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 #Django==3.2.13
-Django==4.1.4
+Django==5.0.2
 django_debug_toolbar
 django_jquery
 django_reversion
@@ -11,7 +11,6 @@ django-tables2
 django-filter
 django-filer
 psycopg2-binary
-django-sortedm2m
 pytesseract
 opencv-python
 pydicom
@@ -43,4 +42,5 @@ faker
 pytest-faker
 blake3
 django-markdownify
-django-clone
\ No newline at end of file
+django-clone
+django-sortedm2m # remove once migrations squashed
\ No newline at end of file
diff --git a/rota/urls.py b/rota/urls.py
index 196a1fef..3878274b 100644
--- a/rota/urls.py
+++ b/rota/urls.py
@@ -7,6 +7,6 @@ from . import views
 app_name = "rota"
 urlpatterns = [
     path(
-        "rota/user_details/<int:pk", views.UserRotaDetailUpdate.as_view(), name="user_details_update"
+        "rota/user_details/<int:pk>", views.UserRotaDetailUpdate.as_view(), name="user_details_update"
     ),
 ]
\ No newline at end of file