Merge branch 'release/3.0.0'

Frojd · Feb 10, 2024 · 6f64c47 · 6f64c47
2 parents 4322f07 + e9c6ad3
commit 6f64c47
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 54 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,9 +9,8 @@ jobs:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         wagtail-version:
-        - 4.1.3
-        - 5.1
         - 5.2
+        - 6.0
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -33,7 +32,6 @@ jobs:
       env:
         DJANGO_SETTINGS_MODULE: tests.app.settings_with_wagtail_modeladmin
 
-
   lint-black:
     runs-on: ubuntu-latest
     needs: test

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,17 @@
 ### Fixed
 ### Removed
 
+## [3.0.0] - 2024-02-10
+### Added
+- Add Wagtail 6 support (@marteinn)
+
+### Changed
+- Add wagtail-modeladmin as a dependency (@marteinn)
+
+### Removed
+- Drop EOL Wagtail 4.1 support (@marteinn)
+- Drop EOL Wagtail 5.1 support (@marteinn)
+
 ## [2.0.0] - 2023-12-30
 ### Added
 - Add Python 3.12 support (@marteinn)

diff --git a/README.md b/README.md
@@ -10,17 +10,9 @@ Instead of deleting pages when pressing delete, pages will get thrown into the "
 1. First install the python package:
 `pip install wagtail-trash`
 
-2. Then add it to your `INSTALLED_APPS`:
+This step will install both `wagtail-trash` and `wagtail-modeladmin` which is a requirement for the admin.
 
-```python
-INSTALLED_APPS = [
-    # ...
-    "wagtail.contrib.modeladmin",  # Wagtail Trash makes use of ModelAdmin, it needs to be installed.
-    "wagtail_trash",
-]
-```
-
-If you are using [wagtail-modeladmin](https://github.com/wagtail-nest/wagtail-modeladmin/) then use `"wagtail_modeladmin"` instead of `"wagtail.contrib.modeladmin"`. like this:
+2. Then add both `wagtail-trash` and `wagtail-modeladmin` to your `INSTALLED_APPS`:
 
 ```python
 INSTALLED_APPS = [

diff --git a/setup.py b/setup.py
@@ -20,6 +20,7 @@
     author_email="[email protected]",
     install_requires=[
         "wagtail>=4.1",
+        "wagtail-modeladmin",
     ],
     extras_require={
         "testing": testing_extras,
@@ -43,12 +44,11 @@
         "Programming Language :: Python :: 3.12",
         "Framework :: Django",
         "Framework :: Django :: 3.2",
-        "Framework :: Django :: 4.0",
-        "Framework :: Django :: 4.1",
         "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.0",
         "Framework :: Wagtail",
-        "Framework :: Wagtail :: 4",
         "Framework :: Wagtail :: 5",
+        "Framework :: Wagtail :: 6",
         "License :: OSI Approved :: MIT License",
     ],
     project_urls={

diff --git a/tests/app/settings.py b/tests/app/settings.py
@@ -41,7 +41,7 @@
     "django.contrib.staticfiles",
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",
-    "wagtail.contrib.modeladmin",
+    "wagtail_modeladmin",
     "wagtail.embeds",
     "wagtail.sites",
     "wagtail.users",

diff --git a/wagtail_trash/migrations/0001_initial.py b/wagtail_trash/migrations/0001_initial.py
@@ -10,30 +10,70 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('wagtailcore', '0052_pagelogentry'),
+        ("wagtailcore", "0052_pagelogentry"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='TrashCanPage',
+            name="TrashCanPage",
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('wagtailcore.page',),
+            bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
-            name='TrashCan',
+            name="TrashCan",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time_recycled', models.DateTimeField(auto_now_add=True)),
-                ('data', models.TextField(blank=True)),
-                ('page', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.page')),
-                ('parent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.page')),
-                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("time_recycled", models.DateTimeField(auto_now_add=True)),
+                ("data", models.TextField(blank=True)),
+                (
+                    "page",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="+",
+                        to="wagtailcore.page",
+                    ),
+                ),
+                (
+                    "parent",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to="wagtailcore.page",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/wagtail_trash/migrations/0002_translation.py b/wagtail_trash/migrations/0002_translation.py
@@ -9,38 +9,54 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('wagtailcore', '0062_comment_models_and_pagesubscription'),
-        ('wagtail_trash', '0001_initial'),
+        ("wagtailcore", "0062_comment_models_and_pagesubscription"),
+        ("wagtail_trash", "0001_initial"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='trashcan',
-            options={'verbose_name': 'Trash Can', 'verbose_name_plural': 'Trash Cans'},
+            name="trashcan",
+            options={"verbose_name": "Trash Can", "verbose_name_plural": "Trash Cans"},
         ),
         migrations.AlterField(
-            model_name='trashcan',
-            name='data',
-            field=models.TextField(blank=True, verbose_name='Data'),
+            model_name="trashcan",
+            name="data",
+            field=models.TextField(blank=True, verbose_name="Data"),
         ),
         migrations.AlterField(
-            model_name='trashcan',
-            name='page',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.page', verbose_name='Page'),
+            model_name="trashcan",
+            name="page",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="+",
+                to="wagtailcore.page",
+                verbose_name="Page",
+            ),
         ),
         migrations.AlterField(
-            model_name='trashcan',
-            name='parent',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.page', verbose_name='Parent'),
+            model_name="trashcan",
+            name="parent",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="+",
+                to="wagtailcore.page",
+                verbose_name="Parent",
+            ),
         ),
         migrations.AlterField(
-            model_name='trashcan',
-            name='time_recycled',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='Time Recycled'),
+            model_name="trashcan",
+            name="time_recycled",
+            field=models.DateTimeField(auto_now_add=True, verbose_name="Time Recycled"),
         ),
         migrations.AlterField(
-            model_name='trashcan',
-            name='user',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='User'),
+            model_name="trashcan",
+            name="user",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="User",
+            ),
         ),
-    ]
+    ]
diff --git a/wagtail_trash/templates/wagtail_trash/move.html b/wagtail_trash/templates/wagtail_trash/move.html
@@ -29,7 +29,9 @@
 
         <ul class="fields">
             {% for field in form.visible_fields %}
-                {% include "wagtailadmin/shared/field_as_li.html" %}
+                <li>
+                    {% include "wagtailadmin/shared/field.html" %}
+                </li>
             {% endfor %}
 
             <li>

diff --git a/wagtail_trash/version.py b/wagtail_trash/version.py
@@ -1,2 +1,2 @@
-version_info = (2, 0, 0)
+version_info = (3, 0, 0)
 version = ".".join(map(str, version_info))
diff --git a/wagtail_trash/wagtail_hooks.py b/wagtail_trash/wagtail_hooks.py
@@ -3,9 +3,9 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _
 from wagtail import hooks
-from wagtail.contrib.modeladmin.helpers import ButtonHelper, PermissionHelper
-from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
-from wagtail.contrib.modeladmin.views import DeleteView, IndexView
+from wagtail_modeladmin.helpers import ButtonHelper, PermissionHelper
+from wagtail_modeladmin.options import ModelAdmin, modeladmin_register
+from wagtail_modeladmin.views import DeleteView, IndexView
 
 from .models import TrashCan, TrashCanPage
 from .utils import trash_can_for_request