Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wagtail 6.0 #62

Merged
merged 4 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: "pip"
Expand All @@ -27,7 +27,7 @@ jobs:
- name: 🏗️ Build
run: python -Im flit build

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./dist

Expand All @@ -42,7 +42,7 @@ jobs:
# Mandatory for trusted publishing
id-token: write
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4

- name: 🚀 Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4

- name: 🐍 Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -62,9 +62,9 @@ jobs:
run: tox --installpkg ./dist/*.whl

- name: ⬆️ Upload coverage data
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-data
name: coverage-data-${{ matrix.python-version }}
path: .coverage.*
if-no-files-found: ignore
retention-days: 1
Expand All @@ -75,17 +75,18 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
# Use latest Python, so it understands all syntax.
python-version: ${{env.PYTHON_LATEST}}

- run: python -Im pip install --upgrade coverage[toml]

- name: Download coverage data
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: coverage-data
pattern: coverage-data-*
merge-multiple: true

- name: + Combine coverage
run: |
Expand All @@ -96,7 +97,7 @@ jobs:
python -Im coverage report --format=markdown >> $GITHUB_STEP_SUMMARY

- name: 📈 Upload HTML report if check failed.
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: html-report
path: htmlcov
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Drop versions of Wagtail < 5.2
- Add Wagtail 6.0 support
- Add Django 5.0 support

## [0.7] - 2023-10-20

### Added
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,18 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Wagtail",
"Framework :: Wagtail :: 4",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
]

dynamic = ["version"]
requires-python = ">=3.8"
dependencies = ["Wagtail>=4.1"]
dependencies = ["Wagtail>=5.2"]

[project.optional-dependencies]
testing = [
Expand Down
3 changes: 1 addition & 2 deletions tests/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.conf.urls import include
from django.urls import path
from django.urls import include, path
from wagtail import urls as wagtail_urls
from wagtail.admin import urls as wagtailadmin_urls

Expand Down
11 changes: 5 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
min_version = 4.11

env_list =
python{3.8,3.9,3.10}-dj{32}-wagtail{41,52}
python{3.11}-dj{41,42}-wagtail{52,60}
python{3.12}-dj{42,50}-wagtail{52,60}
python{3.8,3.9,3.10,3.11,3.12}-django3.2-wagtail5.2
zerolab marked this conversation as resolved.
Show resolved Hide resolved
python{3.8,3.9,3.10,3.11}-django4.2-wagtail{5.2,6.0}
python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.0}
zerolab marked this conversation as resolved.
Show resolved Hide resolved

[gh-actions]
python =
Expand Down Expand Up @@ -36,7 +36,6 @@ deps =
django4.2: Django>=4.2, <5.0
django5.0: Django>=5.0, <5.1

wagtail41: wagtail>=4.1,<4.2
wagtail5.2: wagtail>=5.2, <6.0
wagtail6.0: wagtail>=6.0, <6.1

Expand All @@ -45,7 +44,7 @@ commands =
python -Im coverage run runtests.py test --deprecation all {posargs: -v 2}

[testenv:coverage-report]
base_python = python3.11
base_python = python3.12
package = skip
deps =
coverage>=7.0,<8.0
Expand All @@ -62,7 +61,7 @@ deps =
[testenv:interactive]
package = editable
description = An interactive environment for local testing purposes
base_python = python3.11
base_python = python3.12

commands_pre =
python {toxinidir}/manage.py makemigrations
Expand Down