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

python 3.12, django 5.0, wagtail 6.1, postgres 12-16, psycopg 3 #40

Open
wants to merge 39 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e4932fa
django 4.2 support
jorenham Oct 13, 2023
58ec8cd
python 3.11 and 3.12 support
jorenham Oct 13, 2023
96535bd
wagtail 5.1 support
jorenham Oct 13, 2023
8107a4f
test on postgres 12 & 16 with psycopg3
jorenham Oct 13, 2023
83288db
set minimum wagatil version to 3.0
jorenham Oct 13, 2023
76fd974
fix tox version conflict
jorenham Oct 13, 2023
7cd3d9f
drop django 4.0 from the test matrix, as suggested by @zerolab
jorenham Oct 13, 2023
b6f63ea
testing matrix version dependency version fixes
jorenham Oct 13, 2023
5019d53
testing matrix dependency conflict fix (attempt)
jorenham Oct 13, 2023
0f4d1ae
import error fix
jorenham Oct 13, 2023
223a3a2
allow postgres connection without password
jorenham Oct 13, 2023
4f46197
moved `POSTGRES_HOST_AUTH_METHOD=trust` from tox to the workflow config
jorenham Oct 13, 2023
a864876
fixed missing postgres password
jorenham Oct 13, 2023
7c77f21
fix postgres testing matrix version dependency conflicts
jorenham Oct 13, 2023
2ff5a08
support django 5.0 and wagtail 5.2
jorenham Dec 15, 2023
db2fa9c
test matrix fix attempt
jorenham Dec 15, 2023
3c04b9f
yet another test matrix fix attempt
jorenham Dec 15, 2023
eb18ead
last testing matrix fix attempt
jorenham Dec 15, 2023
1098181
test using latest postgres and psycopg versions
jorenham Feb 8, 2024
ec99bd9
Upgrade to Node 20
jorenham Feb 8, 2024
b5fd7f6
Upgrade `actions/cache`, `actions/setup-node`, and `actions/setup-pyt…
jorenham Feb 8, 2024
ad8139d
remove redundant multi-line run statements
jorenham Feb 8, 2024
d517ecf
use latest `py-actions/flake8@v2` minor release
jorenham Feb 8, 2024
ffb6111
remove wagtail<3 specific migration code
jorenham Feb 8, 2024
cc05253
consistent test matrix `include` ordering
jorenham Feb 8, 2024
27b7718
configures concurrency groups and cancellation for faster workflow runs
jorenham Feb 8, 2024
1be9070
linter fixes
jorenham Feb 8, 2024
b5a5363
Slimmed down the test matrix
jorenham Feb 8, 2024
e1eb8b1
Fix test matrix python/wagtail version compat issue
jorenham Feb 8, 2024
c8282f3
Fix tox version compat issues by preferring LTS's
jorenham Feb 8, 2024
46b6a69
remove redendant test matrix tests, enabled the pip cache
jorenham Feb 8, 2024
1461865
disabled the pip cache (no requirements.txt)
jorenham Feb 8, 2024
2fe4094
Initial wagtail 6.0 support
jorenham Feb 8, 2024
2f40530
small changes referring to renamed/removed features in wagtail 6
jorenham Feb 8, 2024
906d050
add wagtail 6.1 to the testing matrix
jorenham May 24, 2024
d785a06
Update supported versions section
jorenham May 24, 2024
449bf2d
add missing test dependency, and remove unused ones
jorenham May 24, 2024
7c2cf76
update the changelog
jorenham May 24, 2024
ce195c1
update postgres and actions in `nightly-tests` workflow
jorenham May 24, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
strategy:
matrix:
python: ['3.8', '3.9', '3.10']
django: ['3.2', '4.0']
django: ['3.2', '4.0', '4.1', '4.2']
wagtail: ['2.16', '3.0', '4.0']
include:
- wagtail: '2.15'
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
strategy:
matrix:
python: ['3.8', '3.9', '3.10']
django: ['3.2', '4.0']
django: ['3.2', '4.0', '4.1', '4.2']
jorenham marked this conversation as resolved.
Show resolved Hide resolved
wagtail: ['2.16', '3.0', '4.0']
postgres: ['10.8']
include:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ This is the legacy rich text editor for the Wagtail CMS. Based on [Hallo.js](htt

## Supported Versions

- Python 3.7, 3.8, 3.9 3.10
- Django 3.2. 4.0 4.1
- Python 3.7, 3.8, 3.9, 3.10
- Django 3.2, 4.0, 4.1, 4.2
- Wagtail 2.15, 2.16, 3.0, 4.0
jorenham marked this conversation as resolved.
Show resolved Hide resolved

## Installing the Hallo Editor
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Wagtail",
"Framework :: Wagtail :: 2",
"Framework :: Wagtail :: 3",
"Framework :: Wagtail :: 4",
],
install_requires=[
"Django>=3.2,<4.2",
"Django>=3.2,<5",
"Wagtail>=2.15,<4.1",
jorenham marked this conversation as resolved.
Show resolved Hide resolved
],
extras_require={
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ usedevelop = True
envlist =
python{3.7,3.8,3.9,3.10}-django{3.2}-wagtail{2.15,2.16,3.0,4.0,main}-{sqlite,postgres}
python{3.8,3.9,3.10}-django{4.0}-wagtail{2.16,3.0,4.0,main}-{sqlite,postgres}
python{3.8,3.9,3.10}-django{4.1,main}-wagtail{4.0,main}-{sqlite,postgres}
python{3.8,3.9,3.10}-django{4.1,4.2,main}-wagtail{4.0,main}-{sqlite,postgres}

[testenv]
install_command = pip install -e ".[testing]" -U {opts} {packages}
Expand All @@ -23,6 +23,7 @@ deps =
django3.2: Django>=3.2,<3.3
django4.0: Django>=4.0,<4.1
django4.1: Django>=4.1,<4.2
django4.2: Django>=4.2,<5.0
djangomain: git+https://github.com/django/django.git@main#egg=Django

wagtail2.15: wagtail>=2.15,<2.16
Expand Down