Skip to content

Commit

Permalink
fix: Add django 4.2 migrations (#105)
Browse files Browse the repository at this point in the history
* Add django 4.2 migrations

* Fix isort for migration

* Prepare release 2.2

* Skip python3.7 from test matrix

* Update changelog
  • Loading branch information
fsbraun authored Dec 5, 2023
1 parent 1a2ceae commit 3088d72
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion djangocms_googlemap/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.1.1'
__version__ = '2.2.0'
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Generated by Django 4.2.8 on 2023-12-05 08:03

import django.db.models.deletion
from django.db import migrations, models


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'),
),
]
2 changes: 1 addition & 1 deletion tests/requirements/dj42_cms311.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-r base.txt

Django>=3.2,<3.3
Django>=4.2,<4.3
django-cms>=3.11,<3.12
4 changes: 4 additions & 0 deletions tests/requirements/dj50_cms311.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r base.txt

Django>=4.2,<4.3
django-cms>=3.11,<3.12

0 comments on commit 3088d72

Please sign in to comment.