diff --git a/Makefile b/Makefile index 795d61e94..1738dc9d6 100644 --- a/Makefile +++ b/Makefile @@ -45,11 +45,15 @@ lint: $(VIRTUAL_ENV)/bin/isort --diff -c $(SOURCE_DIRS) || EXIT_STATUS=$$?; \ $(VIRTUAL_ENV)/bin/flake8 $(SOURCE_DIRS) --exclude migrations,settings || EXIT_STATUS=$$?; \ npm run lint || EXIT_STATUS=$$?; \ + $(VIRTUAL_ENV)/bin/python manage.py makemigrations --dry-run --check --noinput || EXIT_STATUS=$$?; \ + exit $${EXIT_STATUS} .PHONY: lint-quick lint-quick: EXIT_STATUS=0; \ npm run lint-staged || EXIT_STATUS=$$?; \ + $(VIRTUAL_ENV)/bin/python manage.py makemigrations --dry-run --check --noinput || EXIT_STATUS=$$?; \ + exit $${EXIT_STATUS} .PHONY: lint-python-files lint-python-files: diff --git a/adhocracy4/projects/migrations/0043_migrate_topics_to_m2m_topics.py b/adhocracy4/projects/migrations/0043_migrate_topics_to_m2m_topics.py index 5af5c9491..dce03f053 100644 --- a/adhocracy4/projects/migrations/0043_migrate_topics_to_m2m_topics.py +++ b/adhocracy4/projects/migrations/0043_migrate_topics_to_m2m_topics.py @@ -1,12 +1,12 @@ # Generated by Django 4.2 on 2023-11-29 13:20 -from django.db import migrations, models +from django.db import migrations from django.conf import settings def add_topics_to_m2m_table(apps, schema_editor): if hasattr(settings, "A4_PROJECT_TOPICS"): - topicenum = settings.A4_PROJECT_TOPICS + topicsenum = settings.A4_PROJECT_TOPICS project = apps.get_model("a4projects", "Project") for project in project.objects.all(): for topic_code in project.topics: