From bf7b02d5b51d28b316adf4afa53280cc590f152c Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 22 Jul 2023 20:45:10 +0200 Subject: [PATCH 1/2] Fix squashed migration --- docs/changelog.rst | 2 ++ .../hostingpackages/migrations/0007_add_disk_usage_table.py | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 2626c54..4972f37 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,8 @@ Changelog ========= +* :bug:`-` fix squashed migration for disk space statistics + * :release:`0.14.0 <2023-07-22>` * :feature:`-` add disk space statistics diff --git a/gnuviechadmin/hostingpackages/migrations/0007_add_disk_usage_table.py b/gnuviechadmin/hostingpackages/migrations/0007_add_disk_usage_table.py index 7ba3753..dd88560 100644 --- a/gnuviechadmin/hostingpackages/migrations/0007_add_disk_usage_table.py +++ b/gnuviechadmin/hostingpackages/migrations/0007_add_disk_usage_table.py @@ -6,11 +6,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - replaces = [ - ("hostingpackages", "0007_add_disk_usage_table"), - ("hostingpackages", "0008_add_default_for_used_kb_change_uniqueness"), - ] - dependencies = [ ("hostingpackages", "0006_auto_20150125_1510"), ] From b69ecbfa2dd203dbe3cf012a022ba6a5877c386f Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 22 Jul 2023 20:46:47 +0200 Subject: [PATCH 2/2] Prepare release 0.14.1 --- docs/changelog.rst | 1 + gnuviechadmin/gnuviechadmin/__init__.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 4972f37..07ccf87 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,7 @@ Changelog ========= +* :release:`0.14.1 <2023-07-22>` * :bug:`-` fix squashed migration for disk space statistics * :release:`0.14.0 <2023-07-22>` diff --git a/gnuviechadmin/gnuviechadmin/__init__.py b/gnuviechadmin/gnuviechadmin/__init__.py index dc00c06..fe52136 100644 --- a/gnuviechadmin/gnuviechadmin/__init__.py +++ b/gnuviechadmin/gnuviechadmin/__init__.py @@ -1,4 +1,4 @@ # import celery_app to initialize it from gnuviechadmin.celery import app as celery_app # NOQA -__version__ = "0.14.0" +__version__ = "0.14.1" diff --git a/pyproject.toml b/pyproject.toml index 6f31362..eff7ca2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gva" -version = "0.14.0" +version = "0.14.1" description = "gnuviechadmin web interface" authors = ["Jan Dittberner "] license = "AGPL-3+"