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

Support Wagtail v2.14 #172

Merged
merged 18 commits into from
Aug 19, 2021

Conversation

fabienheureux
Copy link
Contributor

No changes seem to be required from Wagtail 2.13 release notes: https://docs.wagtail.io/en/stable/releases/2.13.html#updated-handling-of-non-required-streamfields

However, I noticed that stream_data was deprecated in 2.12, whereas 2.12 is a valid requirement for Grapple.
I blindly replaced stream_data by raw_data as suggested in the 2.12 release notes (https://docs.wagtail.io/en/stable/releases/2.12.html), however I would like to have a second pair of eyes here.

Tests pass at the moment.

@zerolab
Copy link
Member

zerolab commented May 14, 2021

Thank you @fabienheureux

fwiw, .stream_data will be removed in 2.14 (https://github.com/wagtail/wagtail/blob/stable/2.12.x/wagtail/core/blocks/stream_block.py#L580)

I' would rather spend a bit more time and do this change properly (as outlined in https://docs.wagtail.io/en/stable/releases/2.12.html#stream-data-on-streamfield-values-is-deprecated)

requirements.txt Outdated Show resolved Hide resolved
setup.cfg Outdated Show resolved Hide resolved
@ruisaraiva19 ruisaraiva19 marked this pull request as draft July 8, 2021 00:17
@ruisaraiva19 ruisaraiva19 changed the title Bump wagtail version to support 2.13 Support Wagtail v2.13 Jul 8, 2021
@ruisaraiva19 ruisaraiva19 linked an issue Jul 19, 2021 that may be closed by this pull request
@fabienheureux
Copy link
Contributor Author

fabienheureux commented Jul 23, 2021

I have a question about this conditionnal: https://github.com/GrappleGQL/wagtail-grapple/blob/main/grapple/types/streamfield.py#L111

@zerolab do you have an idea of a query (in the example project) that could go through this conditionnal ?
I am using this query

{
  pages {
    ... on BlogPage {
      body {
        ...on StreamFieldInterface {
          rawValue
        }
      }
    }
  }
}

And can't go through.
I am trying every streamfield block from the example project but I am not sure there is an existing block that matches this conditionnal.

I will continue digging this but maybe you have an idea.

@fabienheureux fabienheureux marked this pull request as ready for review August 17, 2021 15:07
@fabienheureux
Copy link
Contributor Author

I use this PR on an actively developped project (wagtail 2.13) and I did not encounter any issues yet.
Would it be possible to have a second pair of eyes regarding my question above ?

Does anyone have a project, using wagtail < 2.13 on which it could be tested ?

@fabienheureux fabienheureux changed the title Support Wagtail v2.13 Support Wagtail v2.14 Aug 17, 2021
@fabienheureux fabienheureux changed the title Support Wagtail v2.14 Support Wagtail v2.13 Aug 17, 2021
@fabienheureux fabienheureux force-pushed the feature/bump-wagtail-version branch from 86a6a4f to e70d7b3 Compare August 17, 2021 17:46
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.

Hey @fabienheureux,

a couple of minor tweaks and we can get it in and do a release candidate

.github/workflows/ci.yml Outdated Show resolved Hide resolved
grapple/types/streamfield.py Outdated Show resolved Hide resolved
requirements.txt Outdated Show resolved Hide resolved
setup.cfg Outdated Show resolved Hide resolved
@fabienheureux
Copy link
Contributor Author

Hey @fabienheureux,

a couple of minor tweaks and we can get it in and do a release candidate

Thanks a lot for the suggestions !

@fabienheureux fabienheureux changed the title Support Wagtail v2.13 Support Wagtail v2.14 Aug 18, 2021
@fabienheureux fabienheureux requested a review from zerolab August 18, 2021 09:40
@ruisaraiva19 ruisaraiva19 merged commit 9c16691 into torchbox:main Aug 19, 2021
@ruisaraiva19 ruisaraiva19 linked an issue Aug 19, 2021 that may be closed by this pull request
@PeterDekkers
Copy link

@zerolab, @ruisaraiva19, when will this change be released, sorry? I'm seeing the following dependency definition in wagtail-grapple 0.11.0:

wagtail>=2.5, <2.13

So this is preventing Wagtail 2.14 from being installed because of conflicting dependencies, right?

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.

Allow support for wagtail 2.13 and Django 3.2 Move away from accessing stream_data directly
4 participants