Django main (4.1) compatibility #8028
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes a test failure against Django main. In wagtail#2552, a fix was applied to ensure that the project-level MESSAGE_TAGS setting was ignored, allowing end-users to customise that setting for their own projects without it leaking into Wagtail admin styles. Unfortunately, the test was flawed (or was broken in a Django regression at some point): in Django <=4.0, MESSAGE_TAGS was not affected by override_settings after the first request, which meant that unless the test was run in isolation, the custom classname that was supposed to flag up the problem never got applied, and the test always succeeded. The change to SVG icons broke the intent of wagtail#2552, since it used message.level_tag for the icon's classname (and this picks up MESSAGE_TAGS customisations), but due to the broken test this went unnoticed. django/django@24b3165 fixed the override_settings behaviour, making the test fail as it should have done long ago. Here we adjust the test to not rely on override_settings (so that it does what it's supposed to do on all Django versions), fix a test that gets broken as a side effect (because it's unnecessarily checking message.level_tag), and fixes our SVG-icon-powered message include to bypass the MESSAGE_TAGS setting like the old implementation did. Confusing? Yes.
As of django/django@7c4f396 the type="text/css" attribute is omitted.
…ainst django main
Manage this branch in SquashTest this branch here: https://gasmanfixdjango40-o8voe.squash.io |
kaedroho
approved these changes
Feb 23, 2022
This was referenced Feb 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Get tests passing against current Django main branch. Incorporates #8026 and #8027, and pulls in fixes from django-taggit and django-modelcluster:
jazzband/django-taggit#791
jazzband/django-taggit#792
wagtail/django-modelcluster#154
along with an additional fix for django/django#15318, which was just merged today and feels like it's going to bite a lot of Django code in the wild (so I may well drop the django-developers mailing list a line tomorrow to ask if it's really a good idea to put that in a minor release with no deprecation path...)