Skip to content

Wagtail v7.0 maintenance#40

Merged
nickmoreton merged 2 commits intotorchbox:masterfrom
torchbox-forks:support/wagtail-70-upgrade
Jun 6, 2025
Merged

Wagtail v7.0 maintenance#40
nickmoreton merged 2 commits intotorchbox:masterfrom
torchbox-forks:support/wagtail-70-upgrade

Conversation

@nickmoreton
Copy link
Collaborator

This pull request updates the project's testing matrix, dependencies, and configuration files.

Testing matrix updates:

  • Updated the GitHub Actions workflow (.github/workflows/test.yml) to include Django 5.2 and Wagtail 7.0 in the testing matrix, while removing older Wagtail versions (6.0–6.2). Excluded incompatible combinations, such as Python 3.13 with Django 4.2 and certain Wagtail versions.

Dependency and configuration updates:

  • Updated the CHANGELOG.md to reflect support for Django 5.1/5.2, Wagtail 7.0, and Python 3.9–3.13, while dropping support for Python < 3.9. Added a note about the new tox configuration.
  • Replaced tox-poetry with tox in the setup.py file to align with the testing setup.
  • Added a tox.ini file to define environments for local testing with combinations of Python (3.9–3.13), Django (4.2–5.2), and Wagtail (5.2–7.0).

@codecov-commenter
Copy link

Welcome to Codecov 🎉

Once you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests.

Thanks for integrating Codecov - We've got you covered ☂️

@nickmoreton nickmoreton marked this pull request as ready for review May 16, 2025 08:45
@nickmoreton nickmoreton self-assigned this May 16, 2025
Copy link

@ianmeigh ianmeigh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @nickmoreton, Left a few suggestions.

Comment on lines +7 to +9
python{39,310,311,312}-django{42}-wagtail{52,63,64,70}
python{39,310,311,312}-django{51,52}-wagtail{63,64,70}
python313-django{51,52}-wagtail{63,64,70}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestions:

  • Remove Wagtail 5.2 from the matrix (EOL).
  • Remove Python 3.9 as Django 5.1+ doesn't list it as a supported version.
  • Add Python 3.13 earlier, as supported by upper-bound versions.
Suggested change
python{39,310,311,312}-django{42}-wagtail{52,63,64,70}
python{39,310,311,312}-django{51,52}-wagtail{63,64,70}
python313-django{51,52}-wagtail{63,64,70}
python{39,310,311,312}-django{42}-wagtail{63,64,70}
python{310,311,312,313}-django{51,52}-wagtail{63,64,70}

django42: Django>=4.2,<4.3
django51: Django>=5.1,<5.2
django52: Django>=5.2,<5.3
wagtail52: wagtail>=5.2,<5.3

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Remove Wagtail 5.2 (EOL).

Suggested change
wagtail52: wagtail>=5.2,<5.3

django: ["django>=4.2,<4.3", "django>=5.1,<5.2", "django>=5.2,<5.3"]
wagtail:
[
"wagtail>=5.2,<5.3",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove Wagtail 5.2 as it has reached EOL.

Suggested change
"wagtail>=5.2,<5.3",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Remove Wagtail 5 from the classifiers.

Comment on lines +29 to 31
# Django 5.1/5.2 with Wagtail 5.2 combinations are excluded for all Python versions
- django: "django>=5.1,<5.2"
wagtail: "wagtail>=5.2,<5.3"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Remove Wagtail 5.2 (EOL).

Suggested change
# Django 5.1/5.2 with Wagtail 5.2 combinations are excluded for all Python versions
- django: "django>=5.1,<5.2"
wagtail: "wagtail>=5.2,<5.3"

Comment on lines +32 to +34
- django: "django>=5.2,<5.3"
wagtail: "wagtail>=5.2,<5.3"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: Remove Wagtail 5.2 (EOL).

Suggested change
- django: "django>=5.2,<5.3"
wagtail: "wagtail>=5.2,<5.3"

@nickmoreton
Copy link
Collaborator Author

Hi @nickmoreton, Left a few suggestions.

Thanks @ianmeigh I did wonder if 5.2 could be dropped but thought we could let @kevinhowbrook make a decision about it. I just had a feeling it's OK left like that just now.

@nickmoreton nickmoreton requested a review from kevinhowbrook May 28, 2025 10:30
@nickmoreton nickmoreton merged commit 5c5cbf9 into torchbox:master Jun 6, 2025
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants