[3.3 branch] address deprecation of werkzeug.urls.url_parse #1144
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
These are leftovers from python 2.x support. In the one case where the __str__ and __unicode__ methods differ, rename the __unicode__ method to __str__.
This is a backport of e2d0274. Currently the Lektor CLI unconditionally sets the warnings filter to "default". There is no way of the user to configure this. Here we bypass re-configuring the warnings filter if it has already been customized, either via the PYTHONWARNINGS environment variable or by python's -W flag. E.g., now one can show all warnings by doing either of: PYTHONWARNINGS=always lektor build or python -W always -m lektor build Ref: https://docs.python.org/3/library/warnings.html#overriding-the-default-filter
Our Publisher API involves passing a `werkzeug.urls.URL` instance to `Publisher.publish`. As this is an API assumed by custom publishers implemented by Lektor plugins out in the wild, we can not simply change the API. PR lektor#1143 — in the master branch — implements one approach to updating the API in a backward-compatible manner, but it is rather involved. For the sake of the 3.3.x branch, for now we pin werkzeug<2.4 and leave the Publisher API as it is.
dairiki
force-pushed
the
fix.3.3-werkzeug.urls.deprecation
branch
from
4c37f4b
to
01cfbd0
Compare
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.
This is a fix for #1142 for the 3.3-maintenance branch.
Issue(s) Resolved
Fixes #1142
Related Issues / Links
See #1143 for the corresponding PR for the master branch.
Description of Changes
Pin werkzeug<2.4
Our Publisher API currently involves passing a
werkzeug.urls.URLinstance as thetarget_urlargument toPublisher.publish.As there are several Lektor plugins in the wild that implement their own custom publishers, and all of them currently expect that
target_urlwill be awerkzeug.urls.URLinstance, totally eliminating our use of the deprecatedURLclass (without breaking existing plugins) is tricky. (See #1143 for a PR that does this in the master branch.)This PR takes the approach that we will keep the current Publisher API for Lektor 3.3.x. So here we pin
werkzeug<2.4to ensure thatwerkzeug.urls.URLremains available.Other bits
This PR does disuse the deprecated bits of
werkzeug.urlsin the cases where that is fairly straightforward.This PR also backports e2d0274 in order to allow the user to customize Python's warnings filter, should s/he so desire.