From 442cf08a0d757532903a4154911d997d81f9101c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Wed, 16 Apr 2025 16:35:05 +0200 Subject: [PATCH 1/8] Update index definition to be compatible with Django 5 --- vote/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vote/models.py b/vote/models.py index 5c5baa9..a8bbabb 100644 --- a/vote/models.py +++ b/vote/models.py @@ -38,7 +38,7 @@ class Vote(models.Model): class Meta: unique_together = ('user_id', 'content_type', 'object_id', 'action') - index_together = ('content_type', 'object_id') + indexes = [models.Index(fields=["content_type", "object_id"])] @classmethod def votes_for(cls, model, instance=None, action=UP): From 9784cf5764909238b8fb4012b7a05fbb4254ca15 Mon Sep 17 00:00:00 2001 From: Barthelemy Date: Thu, 17 Apr 2025 10:48:15 +0200 Subject: [PATCH 2/8] migration --- ...d_vote_vote_content_a520b4_idx_and_more.py | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py diff --git a/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py b/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py new file mode 100644 index 0000000..90d9e45 --- /dev/null +++ b/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.5 on 2025-04-17 07:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vote', '0004_auto_20170110_1150'), + ] + + operations = [ + migrations.RenameIndex( + model_name='vote', + new_name='vote_vote_content_a520b4_idx', + old_fields=('content_type', 'object_id'), + ), + migrations.AlterField( + model_name='vote', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + ] From 2f13e837dde17427f0fe7d1cba7171655309005a Mon Sep 17 00:00:00 2001 From: Barthelemy Date: Thu, 17 Apr 2025 10:49:50 +0200 Subject: [PATCH 3/8] add django 5.2 to the CI and the setup file --- .github/workflows/ci.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5c67b5..a94b6fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: strategy: max-parallel: 4 matrix: - django-version: [2.2.27, 3.2.12, 4.0.2] + django-version: [2.2.27, 3.2.12, 4.0.2, 5.2.0] steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index 01f183c..0737be1 100644 --- a/setup.py +++ b/setup.py @@ -34,6 +34,7 @@ "Framework :: Django :: 2.0", "Framework :: Django :: 3.0", "Framework :: Django :: 4.0", + "Framework :: Django :: 5.0", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", From 5f303fd2818fccc53c2322557201a8f90c21f352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Tue, 29 Apr 2025 08:58:10 +0200 Subject: [PATCH 4/8] Clean the migration --- ...t_type_object_id_vote_vote_content_a520b4_idx_and_more.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py b/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py index 90d9e45..1bc71fe 100644 --- a/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py +++ b/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py @@ -15,9 +15,4 @@ class Migration(migrations.Migration): new_name='vote_vote_content_a520b4_idx', old_fields=('content_type', 'object_id'), ), - migrations.AlterField( - model_name='vote', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), ] From ac9f67bc9ed35e2c97e08a1e98bf354a02316ef0 Mon Sep 17 00:00:00 2001 From: shellfly Date: Tue, 29 Apr 2025 18:34:27 +0800 Subject: [PATCH 5/8] Update Python version to 3.10 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a94b6fa..fd7cbf2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.9 + - name: Set up Python uses: actions/setup-python@v2 with: - python-version: "3.9" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip From c45f5f6c9840aaec999c249a8c449ee1a582026d Mon Sep 17 00:00:00 2001 From: shellfly Date: Tue, 29 Apr 2025 18:38:17 +0800 Subject: [PATCH 6/8] Update 0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py --- ...tent_type_object_id_vote_vote_content_a520b4_idx_and_more.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py b/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py index 1bc71fe..65e7158 100644 --- a/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py +++ b/vote/migrations/0005_rename_vote_content_type_object_id_vote_vote_content_a520b4_idx_and_more.py @@ -1,6 +1,6 @@ # Generated by Django 4.2.5 on 2025-04-17 07:15 -from django.db import migrations, models +from django.db import migrations class Migration(migrations.Migration): From 31c5cb7fde15602b66040d4b684ef2b41eb12720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Sat, 3 May 2025 17:12:42 +0200 Subject: [PATCH 7/8] django versions in the CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd7cbf2..03aa863 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: strategy: max-parallel: 4 matrix: - django-version: [2.2.27, 3.2.12, 4.0.2, 5.2.0] + django-version: [4.2.20, 5.1.9, 5.2.1] steps: - uses: actions/checkout@v2 From f190dd48041969450ff8f20e7d1035e757bf9b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Sat, 3 May 2025 17:13:41 +0200 Subject: [PATCH 8/8] Proper versions in the setup --- setup.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 0737be1..c6e82ea 100644 --- a/setup.py +++ b/setup.py @@ -27,15 +27,9 @@ "License :: OSI Approved :: Apache Software License", "Environment :: Web Environment", "Framework :: Django", - "Framework :: Django :: 1.7", - "Framework :: Django :: 1.8", - "Framework :: Django :: 1.9", - "Framework :: Django :: 1.10", - "Framework :: Django :: 2.0", - "Framework :: Django :: 3.0", - "Framework :: Django :: 4.0", - "Framework :: Django :: 5.0", - "Programming Language :: Python :: 2.7", + "Framework :: Django :: 4.2", + "Framework :: Django :: 5.1", + "Framework :: Django :: 5.2", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9",