Update django to v6

isic/core/models/doi.py

@@ -97,11 +97,11 @@ class RelatedIdentifierType(models.TextChoices):
 class AbstractDoiRelatedIdentifier(models.Model):
     relation_type = models.CharField(
         max_length=20,
-        choices=RelationType.choices,
+        choices=RelationType,
     )
     related_identifier_type = models.CharField(
         max_length=10,
-        choices=RelatedIdentifierType.choices,
+        choices=RelatedIdentifierType,
     )
     related_identifier = models.CharField(max_length=500)
 

isic/core/models/girder_image.py

@@ -33,7 +33,7 @@ def __str__(self) -> str:
 
 class GirderImage(models.Model):
     status = models.CharField(
-        choices=GirderImageStatus.choices,
+        choices=GirderImageStatus,
         default=GirderImageStatus.UNKNOWN,
         max_length=30,
     )

isic/core/templates/core/collection_detail.html

@@ -3,7 +3,6 @@
 {% load localtime %}
 {% load humanize %}
 {% load markdownify %}
-{% load partials %}
 
 {% block head_extra %}
   {{ block.super }}

isic/core/templates/core/collection_list.html

@@ -1,6 +1,5 @@
 {% extends 'core/base.html' %}
 {% load humanize %}
-{% load partials %}
 
 {% partialdef sortable-header %}
   <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider whitespace-nowrap {{ extra_class }}">

isic/core/templates/core/image_browser.html

@@ -2,7 +2,6 @@
 {% load widget_tweaks %}
 {% load static %}
 {% load humanize %}
-{% load partials %}
 
 {% block head_extra %}
   {{ block.super }}

isic/core/templates/core/partials/collection_detail_actions.html

@@ -1,4 +1,3 @@
-{% load partials %}
 
 {% partialdef disabled-menu-item %}
     <span class="text-gray-400 block px-4 py-2 text-sm cursor-not-allowed" role="menuitem"

isic/ingest/models/accession.py

@@ -270,7 +270,7 @@ class Accession(CreationSortedTimeStampedModel, AccessionMetadata):
     is_cog = models.BooleanField(null=True, blank=True)
 
     status = models.CharField(
-        choices=AccessionStatus.choices, max_length=20, default=AccessionStatus.CREATING
+        choices=AccessionStatus, max_length=20, default=AccessionStatus.CREATING
     )
 
     thumbnail_256 = S3FileField(blank=True)

isic/ingest/models/zip_upload.py

@@ -53,9 +53,9 @@ class Meta(CreationSortedTimeStampedModel.Meta):
     blob_size = models.PositiveBigIntegerField(editable=False)
 
     status = models.CharField(
-        choices=ZipUploadStatus.choices, max_length=20, default=ZipUploadStatus.CREATED
+        choices=ZipUploadStatus, max_length=20, default=ZipUploadStatus.CREATED
     )
-    fail_reason = models.CharField(choices=ZipUploadFailReason.choices, max_length=10, blank=True)
+    fail_reason = models.CharField(choices=ZipUploadFailReason, max_length=10, blank=True)
 
     def __str__(self) -> str:
         return self.blob_name

isic/settings/base.py

@@ -68,7 +68,6 @@
     "oauth2_provider",
     "resonant_utils",
     "s3_file_field",
-    "template_partials",
     "widget_tweaks",
 ]
 
@@ -106,7 +105,6 @@
         "CONN_MAX_AGE": timedelta(minutes=10).total_seconds(),
     },
 }
-DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 STORAGES: dict[str, dict[str, Any]] = {
     # Inject the "default" storage in particular run configurations

pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
   "bcrypt==5.0.0",
   "celery==5.6.3",
   "deepdiff==9.1.0",
-  "django[argon2]==5.2.3",
+  "django[argon2]==6.0.5",
   "django-allauth[socialaccount]==65.17.0",
   "django-auth-style[allauth,oauth-toolkit]==0.15.0",
   "django-cachalot==2.9.0",
@@ -30,7 +30,7 @@ dependencies = [
   "django-redis==6.0.0",
   "django-resonant-settings[allauth,celery]==0.51.0",
   "django-resonant-utils[allauth,s3_storage]==0.19.0",
-  "django-stubs-ext==5.2.9",
+  "django-stubs-ext==6.0.4",
   "django-widget-tweaks==1.5.1",
   "gdal==3.11.0",
   "google-analytics-data==0.22.0",
@@ -59,7 +59,6 @@ dependencies = [
   "sentry-sdk[celery,django,pure_eval]==2.60.0",
   "gunicorn==26.0.0",
   "orjson==3.11.9",
-  "django-template-partials==25.3",
   "pgvector==0.4.2",
   "pyarrow==24.0.0",
   "pydantic-to-pyarrow==0.1.6",
@@ -93,9 +92,9 @@ lint = [
   "semgrep==1.163.0"
 ]
 type = [
-  "mypy==1.19.1",
+  "mypy==2.0.0",
   "celery-types==0.26.0",
-  "django-stubs[compatible-mypy]==5.2.9",
+  "django-stubs[compatible-mypy]==6.0.4",
   "pandas-stubs==3.0.0.260204",
 ]
 test = [