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

Relax willow dependency in Wagtail 4.1.x #10951

Merged
merged 3 commits into from
Sep 27, 2023

Conversation

zerolab
Copy link
Contributor

@zerolab zerolab commented Sep 27, 2023

@squash-labs
Copy link

squash-labs bot commented Sep 27, 2023

Manage this branch in Squash

Test this branch here: https://zerolabchorerelax-willow-depen-rbf0v.squash.io

@zerolab zerolab marked this pull request as draft September 27, 2023 08:36
@zerolab
Copy link
Contributor Author

zerolab commented Sep 27, 2023

circleci fails at flake8 with

./wagtail/admin/views/workflows.py:470:5: F811 redefinition of unused 'model' from line 456
./wagtail/admin/views/workflows.py:474:5: F811 redefinition of unused 'page_title' from line 457

because of

class EditTask(EditView):
    ...
    model = None
    page_title = _("Editing workflow task")
    ...

    @cached_property
    def model(self):
        return type(self.get_object())

@gasman
Copy link
Collaborator

gasman commented Sep 27, 2023

@zerolab I had to fix that on the 5.0.x branch - just needs flake8 pinning: dd8764d

@zerolab zerolab marked this pull request as ready for review September 27, 2023 09:10
@zerolab
Copy link
Contributor Author

zerolab commented Sep 27, 2023

ok, this should be ready now. The tests fail against Django main, but that is something that will be fixed in #10923 for 5.2

@gasman gasman merged commit cf276f2 into wagtail:stable/4.1.x Sep 27, 2023
18 of 19 checks passed
@zerolab zerolab deleted the chore/relax-willow-dependency branch September 27, 2023 12:11
gasman added a commit that referenced this pull request Sep 27, 2023
gasman added a commit that referenced this pull request Sep 27, 2023
gasman added a commit that referenced this pull request Sep 27, 2023
gasman added a commit that referenced this pull request Sep 27, 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.

None yet

2 participants