Skip to content

Commit

Permalink
Fix pending migration implied by Django 4.0 changes (#634) (#635)
Browse files Browse the repository at this point in the history
* Fix pending migration implied by Django 4.0 changes (#634)

- Added new migration as expected by Django 4.0
- Pinned django-filer>=1.4.0,<2.1 in tests base requirements because it is incompatible with supported Django versions from tox config

Co-authored-by: Fabian Braun <[email protected]>
  • Loading branch information
sveetch and fsbraun authored Nov 22, 2022
1 parent 615741f commit 9ac4c15
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x, 17.x]
node-version: [16.x]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('cms', '0022_auto_20180620_1551'),
('djangocms_text_ckeditor', '0004_auto_20160706_1339'),
]

operations = [
migrations.AlterField(
model_name='text',
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'),
),
]
2 changes: 1 addition & 1 deletion tests/requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# requirements from setup.py
django-filer>=1.4.0
django-filer>=1.4.0,<2.1
djangocms-picture>=2.1.0
djangocms-link>=2.2.1
django-polymorphic>=2.0.3
Expand Down

0 comments on commit 9ac4c15

Please sign in to comment.