From e1d98e5067a63a021fed6c103040cbbfa472a0f8 Mon Sep 17 00:00:00 2001 From: magicfelix <felix@felix-zauberer.de> Date: Sat, 22 Jul 2023 18:45:13 +0200 Subject: [PATCH] Adapt to Core 4.0 managed_by feature --- .../apps/matrix/migrations/0001_initial.py | 3 +- .../0003_add_managed_by_app_label.py | 28 +++++++++++++++++++ pyproject.toml | 4 +-- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 aleksis/apps/matrix/migrations/0003_add_managed_by_app_label.py diff --git a/aleksis/apps/matrix/migrations/0001_initial.py b/aleksis/apps/matrix/migrations/0001_initial.py index 8d4865e..694ff2d 100644 --- a/aleksis/apps/matrix/migrations/0001_initial.py +++ b/aleksis/apps/matrix/migrations/0001_initial.py @@ -1,7 +1,6 @@ # Generated by Django 3.2.10 on 2021-12-27 23:08 import aleksis.core.managers -import django.contrib.sites.managers from django.db import migrations, models import django.db.models.deletion @@ -51,7 +50,7 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Matrix profiles', }, managers=[ - ('objects', django.contrib.sites.managers.CurrentSiteManager()), + ('objects', aleksis.core.managers.AlekSISBaseManager()), ], ), migrations.CreateModel( diff --git a/aleksis/apps/matrix/migrations/0003_add_managed_by_app_label.py b/aleksis/apps/matrix/migrations/0003_add_managed_by_app_label.py new file mode 100644 index 0000000..a91cc40 --- /dev/null +++ b/aleksis/apps/matrix/migrations/0003_add_managed_by_app_label.py @@ -0,0 +1,28 @@ +# Generated by Django 4.2.3 on 2023-07-22 16:39 + +import aleksis.core.managers +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('sites', '0002_alter_domain_unique'), + ('contenttypes', '0002_remove_content_type_name'), + ('core', '0052_site_related_name'), + ('matrix', '0002_drop_onetoone'), + ] + + operations = [ + migrations.AddField( + model_name='matrixprofile', + name='managed_by_app_label', + field=models.CharField(blank=True, editable=False, max_length=255, verbose_name='App label of app responsible for managing this instance'), + ), + migrations.AddField( + model_name='matrixroom', + name='managed_by_app_label', + field=models.CharField(blank=True, editable=False, max_length=255, verbose_name='App label of app responsible for managing this instance'), + ), + ] diff --git a/pyproject.toml b/pyproject.toml index fa09b01..91f87f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "AlekSIS-App-Matrix" -version = "2.0.1.dev0" +version = "3.0.0.dev0" packages = [ { include = "aleksis" } ] @@ -32,7 +32,7 @@ url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple" priority = "supplemental" [tool.poetry.dependencies] python = "^3.9" -aleksis-core = "^3.0" +aleksis-core = "^4.0.0.dev0" [tool.poetry.plugins."aleksis.app"] matrix = "aleksis.apps.matrix.apps:DefaultConfig" -- GitLab