Pieter Lenaerts <[email protected]> writes:

> Op 6/12/2025 om 20:42 schreef Louis-Philippe Véronneau:
>> Hello!
>>
>> I had a look at your RFS for beets. I don't have any comments on the
>> changes you did, but sadly, the package FTBFS with Python 3.14.
>>
>> I get the following error:
>>
>> ==================================================================
>> ______________ TestTranslation.test_translate[already translated]
>>
>> self = <test.plugins.test_lyrics.TestTranslation object at
>> 0x7f92ef0d69e0>
[snip]
>> E       TypeError: 'str' object cannot be interpreted as an integer
>>
>> beetsplug/lyrics.py:832: TypeError
>> ==================================================================
>>
>> As such, I've removed beets from the list for now. Feel free to add it
>> again once the issue is fixed!
>
>
> Thanks. I started patching for python 3.14. I'm adding this to the open
> RFS bug for reference.

Thank you for working on this Pieter!  Would you please fix your fork's
history so that your work can be merged?  Ie the following six commits
are missing from your copy and it results in non-fastforwardable
history:

https://salsa.debian.org/python-team/packages/beets/-/compare/debian%2Fmaster...debian%2Fmaster?from_project_id=102563

A "pull --rebase" (from the Debian Python Team remote) and 3-way merge
is almost certainly what is required to fix this, and this will also
resolve some of the outstanding issues with the version of the package
being discussed at this RFS bug :)

I didn't check, but I suspect the rebase range will rewrite your import
of a new upstream version in your fork, if that's the case, don't worry
about it for now.  A method we can use to fix it when we're ready to
merge your work and upload is:

  1. You'll import the new upstream version directly to the DPT copy.
  2. You (or someone else) will cherry-pick the range of commits that
  affect exclusively debian/*, and these will be applied to the DPT copy
  which has the new upstream version.
  [3. Optionally rebase --committer-date-is-author-date the
  cherry-picked ranged, leaving the gbp-created upstream tag untouched.]

Regarding the Python 3.14 compat fixes, this is orthogonal to a
sponsorship request, and I recommend filing a bug against src:beets.

Best,
Nicholas

Attachment: signature.asc
Description: PGP signature

Reply via email to