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 5 support #59

Merged
merged 6 commits into from Nov 2, 2023
Merged

Wagtail 5 support #59

merged 6 commits into from Nov 2, 2023

Conversation

jams2
Copy link
Contributor

@jams2 jams2 commented Oct 17, 2023

  • Adds support for Wagtail 5
  • Drops Python 3.7 from the CI matrix as it's unsupported
  • Drops Django 4.0 from the CI matrix as it's unsupported
  • Renames master to main in tox.ini (in line with Wagtail upstream)

I have tested importing documents via:

  • OneDrive import
  • Google import
  • Local document import

I have tested constructing StructBlocks using custom converter classes.

Comment on lines +7 to +9
html_template='wagtail_content_import/confirm_dialog.html',
js_template=None,
template_vars={},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unrelated change, just improves readability.

- Drop Python 3.7 from the matrix as it's unsupported
- Drop Django 4.0 from the matrix as it's unsupported
- Rename master to main (in line with Wagtail upstream)
@jams2 jams2 marked this pull request as ready for review October 19, 2023 12:24
Copy link
Member

@zerolab zerolab left a comment

Choose a reason for hiding this comment

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

Needs a couple of small changes. LGTM otherwise (caveat: haven't got a chance to test locally)

tox.ini Outdated
python{3.8,3.9,3.10}-django{3.2}-wagtail{4.1,4.2,master}-{sqlite,postgres}
python{3.8,3.9,3.10}-django{4.0,4.1}-wagtail{4.1,4.2,master}-{sqlite,postgres}
python{3.11}-django{4.1}-wagtail{4.1,4.2,master}-{sqlite,postgres}
python{3.8,3.9,3.10}-django3.2-wagtail{4.1,4.2,5.0,5.1,main}-{sqlite,postgres}
Copy link
Member

Choose a reason for hiding this comment

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

Suggestion: drop Wagtail 4.2 as it has EOLed - https://endoflife.date/wagtail. This will simplify the matrix considerably

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, reshuffled this a bit in f45bfef, it's a little easier on the eyes/brain.

tox.ini Outdated
Comment on lines 35 to 36
django4.0: Django>=4.0,<4.1
django4.1: Django>=4.1,<4.2
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
django4.0: Django>=4.0,<4.1
django4.1: Django>=4.1,<4.2
django4.1: Django>=4.1,<4.2
django4.2: Django>=4.2,<5.0

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in 92e62bd

Copy link
Member

Choose a reason for hiding this comment

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

Nitpick - the commit message says 4.1 (which isn't EOL yet as it's an LTS release), although it is indeed removing 4.2.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, reworded.

Copy link
Member

@gasman gasman left a comment

Choose a reason for hiding this comment

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

Other than the commit message nitpick, LGTM!

@gasman gasman merged commit c237dcb into torchbox:master Nov 2, 2023
9 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.

None yet

3 participants