[Merge] ~pushkarnk/ubuntu/+source/lektor:werkzeug-3.0.1-compat into ubuntu/+source/lektor:ubuntu/devel

[Pushkar Kulkarni]

> Thank you for working on this!
> 
> I see you have added dep3 headers linking to upstream pull requests. In the
> general case, the existence of an upstream pull request - even a "Merged" one
> - does not necessarily mean that what was submitted in that pull request is
> what was actually merged upstream. So it's necessary for me to check, and I
> found that this is indeed not the case here.
> 
> Upstream have a branch named "3.3-maintenance" which seems like the relevant
> one here. As far as I can tell, the relevant changes are in the upstream
> commit 2231baa to this upstream branch.
> 
> However, comparing this to your patch `werkzeug-3-api.patch` shows substantial
> differences that I'm struggling to reconcile or review.
> 
> What I expect is:
> 
> If "Origin: upstream" is specified as you have done, then a URL that points to
> an upstream commit that was actually committed that should be near enough
> identical to the quilt patch included in your proposed changes.
> 
> Or, "Origin: backport" with further explanation of what you have changed and
> why you had to change it; ideally as close as practical to what upstream
> committed so that it can be reviewed more easily.
> 
> Alternatively, given that upstream have a 3.3.10 release, is there a reason
> you have not brought this in in its entirety? Noble is not in feature freeze
> yet so this would generally be acceptable without much further thought, and
> reviewing upstream changes for packaging impact seems like it would be easier
> in this case than reviewing your backport.

Thanks for the review!

I agree. I have changed the Origin: to `backport` and have provided an explanation of what the additional changes are in the DEP3 header. I also updated the patch with a couple more changes, which I previously missed out on.

To answer your question of pulling the entire 3.3.10, I can see that upstream does not completely move away from the python-werkzeug 2.3.X urls API on the '3.3-maintenance' branch. For example, in tests/test_publisher.py they just seem to be only ignoring the deprecation warnings [1] and the old urls API is still used in lektor/publisher.py [2]. This is what the "additional changes" mentioned here address. And they are localized to lektor/publisher.py.

I see more value in waiting for 3.4.X which seems to have completely done away with werkzeug 2.3.X urls API. They've been doing periodic pre-releases for 3.4 since June 2023.


[1] https://github.com/lektor/lektor/blob/7a47360505fb7b4791fac83f3fea615c2323b077/tests/test_publisher.py#L45
[2] https://github.com/lektor/lektor/blob/3.3-maintenance/lektor/publisher.py#L657
-- 
https://code.launchpad.net/~pushkarnk/ubuntu/+source/lektor/+git/lektor/+merge/458931
Your team Ubuntu Sponsors is requested to review the proposed merge of ~pushkarnk/ubuntu/+source/lektor:werkzeug-3.0.1-compat into ubuntu/+source/lektor:ubuntu/devel.