From 59a38676c521bd1aec4137201ac7cee820ea21b2 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 5 Dec 2023 09:04:14 +0100 Subject: [PATCH 1/5] Add django 4.2 migrations --- ..._alter_googlemap_cmsplugin_ptr_and_more.py | 30 +++++++++++++++++++ tests/requirements/dj42_cms311.txt | 2 +- tests/requirements/dj50_cms311.txt | 4 +++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 djangocms_googlemap/migrations/0012_alter_googlemap_cmsplugin_ptr_and_more.py create mode 100644 tests/requirements/dj50_cms311.txt diff --git a/djangocms_googlemap/migrations/0012_alter_googlemap_cmsplugin_ptr_and_more.py b/djangocms_googlemap/migrations/0012_alter_googlemap_cmsplugin_ptr_and_more.py new file mode 100644 index 0000000..62b0bd7 --- /dev/null +++ b/djangocms_googlemap/migrations/0012_alter_googlemap_cmsplugin_ptr_and_more.py @@ -0,0 +1,30 @@ +# Generated by Django 4.2.8 on 2023-12-05 08:03 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms', '0022_auto_20180620_1551'), + ('djangocms_googlemap', '0011_googlemap_map_id'), + ] + + operations = [ + migrations.AlterField( + model_name='googlemap', + name='cmsplugin_ptr', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='%(app_label)s_%(class)s', serialize=False, to='cms.cmsplugin'), + ), + migrations.AlterField( + model_name='googlemapmarker', + name='cmsplugin_ptr', + field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='%(app_label)s_%(class)s', serialize=False, to='cms.cmsplugin'), + ), + migrations.AlterField( + model_name='googlemaproute', + name='cmsplugin_ptr', + field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='%(app_label)s_%(class)s', serialize=False, to='cms.cmsplugin'), + ), + ] diff --git a/tests/requirements/dj42_cms311.txt b/tests/requirements/dj42_cms311.txt index f54dae0..1814e12 100644 --- a/tests/requirements/dj42_cms311.txt +++ b/tests/requirements/dj42_cms311.txt @@ -1,4 +1,4 @@ -r base.txt -Django>=3.2,<3.3 +Django>=4.2,<4.3 django-cms>=3.11,<3.12 diff --git a/tests/requirements/dj50_cms311.txt b/tests/requirements/dj50_cms311.txt new file mode 100644 index 0000000..1814e12 --- /dev/null +++ b/tests/requirements/dj50_cms311.txt @@ -0,0 +1,4 @@ +-r base.txt + +Django>=4.2,<4.3 +django-cms>=3.11,<3.12 From ef6f727b52fcda4c31caf38f65254b02776f81ab Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 5 Dec 2023 09:06:02 +0100 Subject: [PATCH 2/5] Fix isort for migration --- .../migrations/0012_alter_googlemap_cmsplugin_ptr_and_more.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangocms_googlemap/migrations/0012_alter_googlemap_cmsplugin_ptr_and_more.py b/djangocms_googlemap/migrations/0012_alter_googlemap_cmsplugin_ptr_and_more.py index 62b0bd7..e1bcf68 100644 --- a/djangocms_googlemap/migrations/0012_alter_googlemap_cmsplugin_ptr_and_more.py +++ b/djangocms_googlemap/migrations/0012_alter_googlemap_cmsplugin_ptr_and_more.py @@ -1,7 +1,7 @@ # Generated by Django 4.2.8 on 2023-12-05 08:03 -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): From 8737af34b5f2162dbf35c7275294f24709324c9e Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 5 Dec 2023 09:09:02 +0100 Subject: [PATCH 3/5] Prepare release 2.2 --- djangocms_googlemap/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangocms_googlemap/__init__.py b/djangocms_googlemap/__init__.py index 55fa725..04188a1 100644 --- a/djangocms_googlemap/__init__.py +++ b/djangocms_googlemap/__init__.py @@ -1 +1 @@ -__version__ = '2.1.1' +__version__ = '2.2.0' From 533e2d62693828b2668f85f00dee57552f693362 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 5 Dec 2023 09:13:25 +0100 Subject: [PATCH 4/5] Skip python3.7 from test matrix --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb1ea96..026750a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ] + python-version: [ "3.8", "3.9", "3.10", "3.11" ] requirements-file: [ dj22_cms37.txt, dj22_cms38.txt, From fce1045fee238fffcb434861de1eca1696b6ae84 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 5 Dec 2023 10:12:20 +0100 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3af926d..371cf91 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,8 +2,14 @@ Changelog ========= +2.2.0 (2023-12-06) +================== + +* Add Django 4.2 support to testing +* Add migrations needed for Django 4.2 + 2.1.1 (2023-09-07) -========== +================== * Remove tight django-treebeard restriction added when 4.5.0 contained breaking changes. The core CMS and django-treebeard have since been patched to resolve the issue. * Add metadata about supported Python/Django/DjangoCMS version