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 4.2 upgrade #673

Merged
merged 14 commits into from
Feb 15, 2023
Merged

Conversation

katdom13
Copy link
Contributor

@katdom13 katdom13 commented Feb 2, 2023

  • Update testing to accommodate Wagtail 4.2

@katdom13 katdom13 marked this pull request as draft February 2, 2023 09:20
@katdom13 katdom13 changed the title Draft: Pre-release Wagtail 4.2 upgrade Pre-release Wagtail 4.2 upgrade Feb 2, 2023
@katdom13 katdom13 changed the title Pre-release Wagtail 4.2 upgrade Draft: Pre-release Wagtail 4.2 upgrade Feb 2, 2023
@katdom13 katdom13 force-pushed the support/wagtail-4.2-upgrade branch from cf5f7f0 to f4d3bae Compare February 2, 2023 09:47
@katdom13 katdom13 marked this pull request as ready for review February 2, 2023 09:59
.github/workflows/test.yml Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Feb 2, 2023

Codecov Report

Base: 91.61% // Head: 93.05% // Increases project coverage by +1.43% 🎉

Coverage data is based on head (146b4e1) compared to base (1fc56b0).
Patch coverage: 99.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #673      +/-   ##
==========================================
+ Coverage   91.61%   93.05%   +1.43%     
==========================================
  Files          47       47              
  Lines        4008     3929      -79     
  Branches      609      581      -28     
==========================================
- Hits         3672     3656      -16     
+ Misses        201      161      -40     
+ Partials      135      112      -23     
Impacted Files Coverage Δ
wagtail_localize/test/settings.py 100.00% <ø> (ø)
wagtail_localize/compat.py 81.25% <66.66%> (+29.39%) ⬆️
wagtail_localize/components.py 85.71% <100.00%> (+3.02%) ⬆️
wagtail_localize/fields.py 92.59% <100.00%> (+1.52%) ⬆️
wagtail_localize/locales/forms.py 100.00% <100.00%> (ø)
wagtail_localize/locales/tests.py 100.00% <100.00%> (ø)
wagtail_localize/locales/utils.py 100.00% <100.00%> (ø)
wagtail_localize/locales/views.py 93.37% <100.00%> (ø)
wagtail_localize/locales/wagtail_hooks.py 94.73% <100.00%> (ø)
wagtail_localize/modeladmin/helpers.py 100.00% <100.00%> (ø)
... and 19 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

CHANGELOG.md Outdated Show resolved Hide resolved
@katdom13 katdom13 force-pushed the support/wagtail-4.2-upgrade branch from d4011e2 to eeb8e73 Compare February 2, 2023 15:52
Copy link
Collaborator

@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.

A few more tweaks and we should be there

tox.ini Outdated Show resolved Hide resolved
tox.ini Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@katdom13 katdom13 force-pushed the support/wagtail-4.2-upgrade branch 3 times, most recently from a59e3bd to 3d9db3b Compare February 6, 2023 03:26
@katdom13 katdom13 force-pushed the support/wagtail-4.2-upgrade branch 5 times, most recently from 13c2958 to 92f6227 Compare February 6, 2023 11:01
@katdom13 katdom13 force-pushed the support/wagtail-4.2-upgrade branch from 92f6227 to f219766 Compare February 6, 2023 11:10
tox.ini Outdated Show resolved Hide resolved
@katdom13 katdom13 requested a review from zerolab February 6, 2023 11:22
pyproject.toml Outdated Show resolved Hide resolved
Revert "Code cleanup"

This reverts commit 4262d82.

Code cleanup
@katdom13 katdom13 force-pushed the support/wagtail-4.2-upgrade branch from 5ffbfdf to 8bd6917 Compare February 6, 2023 15:41
@katdom13 katdom13 requested a review from zerolab February 6, 2023 16:45
Copy link
Collaborator

@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.

This is taking great shape. Thank you for your effort, @katdom13

Left a number of further cleanup needed, plus the main migration should not be changed.

In additional to that,
https://github.com/wagtail/wagtail-localize/tree/146b4e15bfc50974dddabe424765c3ae85028768/wagtail_localize/static_src/legacy needs to go since it is 2.x, as well as

import LegacyTranslationEditor from '../legacy/editor/components/TranslationEditor';
needs to be upadte (remove the legacy import and the has_legacy_styling conditional (
if (props.has_legacy_styling) {
Component = LegacyTranslationEditor;
}
)

wagtail_localize/compat.py Outdated Show resolved Hide resolved
wagtail_localize/fields.py Show resolved Hide resolved
wagtail_localize/migrations/0001_initial.py Outdated Show resolved Hide resolved
wagtail_localize/test/models.py Outdated Show resolved Hide resolved
wagtail_localize/tests/utils.py Outdated Show resolved Hide resolved
wagtail_localize/views/edit_translation.py Outdated Show resolved Hide resolved
wagtail_localize/wagtail_hooks.py Outdated Show resolved Hide resolved
@katdom13 katdom13 requested a review from zerolab February 7, 2023 10:25
@katdom13
Copy link
Contributor Author

katdom13 commented Feb 10, 2023

The latest commit aa2c0c4 updates the workflow to use tox-gh-actions as suggested by Nick Moreton.
This approach eliminates the redundancy of duplicating the test configuration within the workflow, with tox.ini serving as the sole method of configuring the test matrix.

@katdom13 katdom13 changed the title Draft: Pre-release Wagtail 4.2 upgrade Wagtail 4.2 upgrade Feb 13, 2023
@zerolab zerolab merged commit 2b7d246 into wagtail:main Feb 15, 2023
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.

4 participants