fix: wrap django 5 imports in try-except block #958
Closed
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
mariajgrimaldi
force-pushed
the
MJG/fix-django4-import-errors
branch
from
4dbc1cd to
6e5f75b
Compare
mariajgrimaldi
changed the title
regisb
reviewed
Dec 14, 2023
| warnings.filterwarnings("ignore", category=RemovedInDjango50Warning) | ||
| warnings.filterwarnings("ignore", category=RemovedInDjango51Warning) | ||
| try: | ||
| from django.utils.deprecation import RemovedInDjango50Warning, RemovedInDjango51Warning |
There was a problem hiding this comment.
Could you please just add a comment that includes the "REMOVE-AFTER-V18" string? and explain why this try/except was still needed in v17.
regisb
requested changes
Dec 14, 2023
kdmccormick
reviewed
Dec 18, 2023
Comment on lines
+157
to
+158
| except ImportError: | ||
| pass |
There was a problem hiding this comment.
Suggested change
| except ImportError: | |
| pass | |
| except ImportError: | |
| # REMOVE-AFTER-V18: | |
| # In Quince, edx-platform uses Django 5. But on master, edx-platform still uses Django 3. | |
| # So, Tutor v17 needs to silence these warnings, whereas Tutor v17-nightly fails to import them. | |
| # Once edx-platform master is upgraded to Django 5, the try-except wrapper can be removed. | |
| pass |
friendly edit -- just adding a REMOVE-AFTER comment
|
Merged via aa01e30 Thanks for the fix @mariajgrimaldi ! |
|
@regisb Oof, I just realized I merged this to nightly instead of master 🤦🏻 I guess that fine, though, since we don't need this change on master? Let me know if you'd rather I make the same change on master too, for consistency's sake. |
|
That's fine, there is no need to backport if the feature is not strictly necessary. But next time, please rebase instead of adding a merge commit. |
|
Will do. |
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.
Description
This PR wraps Django5 warning imports in try-except blocks to avoid failures in django3 that's still in use in edx-platform's master branch. For more info on the report see: https://openedx.slack.com/archives/CGE253B7V/p1702402901252609