From e37bda56fcf28ce01a6fe7b1d68373cec5fc1dc7 Mon Sep 17 00:00:00 2001
From: Norbert Kwizera <norkans7@gmail.com>
Date: Thu, 22 Aug 2024 16:40:10 +0200
Subject: [PATCH 1/2] Support django 5.1

---
 .github/workflows/ci.yml |  2 +-
 poetry.lock              | 10 +++++-----
 pyproject.toml           |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6b0643a..510f874 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10.x", "3.11.x", "3.12.x"]
-        django-version: ["4.2.x", "5.0.x"]
+        django-version: ["5.0.x", "5.1.x"]
     env:
       redis-version: "6.2"
       pg-version: "15"
diff --git a/poetry.lock b/poetry.lock
index cb70cad..189fdd9 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -443,17 +443,17 @@ six = ">=1.13.0"
 
 [[package]]
 name = "django"
-version = "5.0.8"
+version = "5.1"
 description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
 optional = false
 python-versions = ">=3.10"
 files = [
-    {file = "Django-5.0.8-py3-none-any.whl", hash = "sha256:333a7988f7ca4bc14d360d3d8f6b793704517761ae3813b95432043daec22a45"},
-    {file = "Django-5.0.8.tar.gz", hash = "sha256:ebe859c9da6fead9c9ee6dbfa4943b04f41342f4cea2c4d8c978ef0d10694f2b"},
+    {file = "Django-5.1-py3-none-any.whl", hash = "sha256:d3b811bf5371a26def053d7ee42a9df1267ef7622323fe70a601936725aa4557"},
+    {file = "Django-5.1.tar.gz", hash = "sha256:848a5980e8efb76eea70872fb0e4bc5e371619c70fffbe48e3e1b50b2c09455d"},
 ]
 
 [package.dependencies]
-asgiref = ">=3.7.0,<4"
+asgiref = ">=3.8.1,<4"
 sqlparse = ">=0.3.1"
 tzdata = {version = "*", markers = "sys_platform == \"win32\""}
 
@@ -1411,4 +1411,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "3200b7c84c82069f15b63146ba78c49daeb1170f894eff2c7a0a743e640cb583"
+content-hash = "6a1484d52eba7bc58443a5a9e81a290b04a698ce5e928074745de6928295d70d"
diff --git a/pyproject.toml b/pyproject.toml
index abf4580..207dbad 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ repository = "http://github.com/rapidpro/dash"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-Django = ">= 4.2.14, < 5.1"
+Django = ">= 5.0.8, < 5.2"
 celery = "^5.1"
 django-compressor = "^4.0"
 django-redis = "^5.2.0"

From d1c17e38396e490725d36f0d1efd335d35ff2876 Mon Sep 17 00:00:00 2001
From: Norbert Kwizera <norkans7@gmail.com>
Date: Thu, 22 Aug 2024 16:45:21 +0200
Subject: [PATCH 2/2] Adjust old migrations to not use index_together

---
 ...11_alter_dashblock_index_together_and_more.py | 16 +++++++++-------
 .../0031_alter_orgbackend_index_together.py      |  8 ++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dash/dashblocks/migrations/0011_alter_dashblock_index_together_and_more.py b/dash/dashblocks/migrations/0011_alter_dashblock_index_together_and_more.py
index feba7bb..2132151 100644
--- a/dash/dashblocks/migrations/0011_alter_dashblock_index_together_and_more.py
+++ b/dash/dashblocks/migrations/0011_alter_dashblock_index_together_and_more.py
@@ -1,6 +1,6 @@
 # Generated by Django 4.1.7 on 2023-03-29 14:58
 
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -10,12 +10,14 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AlterIndexTogether(
-            name="dashblock",
-            index_together={("org", "is_active", "dashblock_type", "priority")},
+        migrations.AddIndex(
+            model_name="dashblock",
+            index=models.Index(
+                fields=["org", "is_active", "dashblock_type", "priority"], name="dashblocks__org_id_024805_idx"
+            ),
         ),
-        migrations.AlterIndexTogether(
-            name="dashblocktype",
-            index_together={("slug", "name")},
+        migrations.AddIndex(
+            model_name="dashblocktype",
+            index=models.Index(fields=["slug", "name"], name="dashblocks__slug_c0c6c6_idx"),
         ),
     ]
diff --git a/dash/orgs/migrations/0031_alter_orgbackend_index_together.py b/dash/orgs/migrations/0031_alter_orgbackend_index_together.py
index b482e78..fbc2dcd 100644
--- a/dash/orgs/migrations/0031_alter_orgbackend_index_together.py
+++ b/dash/orgs/migrations/0031_alter_orgbackend_index_together.py
@@ -1,6 +1,6 @@
 # Generated by Django 4.1.7 on 2023-03-29 13:57
 
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -9,8 +9,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AlterIndexTogether(
-            name="orgbackend",
-            index_together={("org", "is_active", "slug")},
+        migrations.AddIndex(
+            model_name="orgbackend",
+            index=models.Index(fields=["org", "is_active", "slug"], name="orgs_orgbac_org_id_607508_idx"),
         ),
     ]