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

Support/wagtail 50 #1

Merged
merged 15 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
max-parallel: 5
matrix:
python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 6 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Unreleased
=================
- Upgrade to Wagtail 5.0, drop support for Wagtail < 4.1
- Add Django 4.2 support, drop support for Django 4.0
- Add Python 3.11 support, drop support for Python 3.7

0.15.3
=================
- Add wagtail >= 2.15 support with get_context_data override instead of get_context
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ flake8:

isort:
pip install isort
isort --recursive src tests
isort src tests

dist:
pip install wheel
Expand Down
4 changes: 2 additions & 2 deletions sandbox/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django>=3.2,<4.2
wagtail>=4.1,<4.3
Django>=3.2
wagtail>=4.1
django-debug-toolbar
-e .[docs,test]
2 changes: 1 addition & 1 deletion sandbox/sandbox/apps/search/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.shortcuts import render

from wagtail.models import Page
from wagtail.search.models import Query
from wagtail.contrib.search_promotions.models import Query


def search(request):
Expand Down
Binary file modified screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 5 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
[tox]
envlist =
flake8
py{37}-dj{32}-wt{41,42}
py{38,39,310}-dj{32,40,41}-wt{41,42}
py{311}-dj{41}-wt{41,42}
py{38,39,310}-dj{32,41}-wt{41,42,50}
py{311}-dj{41,42}-wt{50}

[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.11: py311

[testenv]
basepython =
py37: python3.7
py38: python3.8
py39: python3.9
py310: python3.10
Expand All @@ -24,10 +21,11 @@ commands = coverage run --parallel -m pytest -rs {posargs}
extras = test
deps =
dj32: Django>=3.2,<3.3
dj40: Django>=4.0,<4.1
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<4.3
wt41: wagtail>=4.1,<4.2
wt42: wagtail>=4.2,<5.0
wt50: wagtail>=5.0,<5.1
geoip2: geoip2

[testenv:coverage-report]
Expand All @@ -43,7 +41,7 @@ basepython = python3.8
deps = flake8==3.5.0
commands =
flake8 src tests setup.py
isort -q --recursive --diff src/ tests/
isort --diff src/ tests/

[testenv:format]
basepython = python3.8
Expand Down