Skip to content

Commit dec3a24

Browse files
committed
Merge branch 'release/1.0.1'
2 parents 114064b + 2f71f76 commit dec3a24

File tree

7 files changed

+12
-30
lines changed

7 files changed

+12
-30
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
wagtail-version:
1212
- 4.1.3
1313
- 4.2.1
14+
- 5.0
1415
steps:
1516
- uses: actions/checkout@v2
1617
- name: Set up Python ${{ matrix.python-version }}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
### Fixed
77
### Removed
88

9+
## [1.0.1] - 2023-05-21
10+
### Added
11+
- Add Wagtail 5 support (@marteinn)
12+
913
## [1.0.0] - 2023-03-23
1014
### Added
1115
- Add delete_stray_pages command for clearing stray pages in trash can (@marteinn)

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include LICENSE
22
include README.md
3+
include CHANGELOG.md
34
exclude manage.py
45

56
recursive-include wagtail_trash/templates *

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@
4242
"Programming Language :: Python :: 3.10",
4343
"Programming Language :: Python :: 3.11",
4444
"Framework :: Django",
45-
"Framework :: Django :: 2.2",
4645
"Framework :: Django :: 3.2",
4746
"Framework :: Django :: 4.0",
47+
"Framework :: Django :: 4.1",
48+
"Framework :: Django :: 4.2",
4849
"Framework :: Wagtail",
4950
"Framework :: Wagtail :: 4",
51+
"Framework :: Wagtail :: 5",
5052
"License :: OSI Approved :: MIT License",
5153
],
5254
project_urls={

tests/app/migrations/0001_initial.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 3.1.2 on 2020-10-13 08:36
1+
# Generated by Django 4.1.5 on 2023-05-21 12:54
22

33
from django.db import migrations, models
44
import django.db.models.deletion
@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
99
initial = True
1010

1111
dependencies = [
12-
('wagtailcore', '0052_pagelogentry'),
12+
('wagtailcore', '0078_referenceindex'),
1313
]
1414

1515
operations = [

tests/app/migrations/0002_auto_20201015_1424.py

Lines changed: 0 additions & 26 deletions
This file was deleted.

wagtail_trash/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version_info = (1, 0, 0)
1+
version_info = (1, 0, 1)
22
version = ".".join(map(str, version_info))

0 commit comments

Comments
 (0)