Port scripts to python 3 before doomsday
ClosedPublic
Actions

Authored by Itms on Dec 22 2019, 8:19 PM.

Details

Reviewers

vladislavbelov
Gallaecio

Commits

rP24892: Port remaining python2 helper scripts to python3, fixes #5694.

Trac Tickets

#5694

Summary

Python 2 will reach its end of life on the new year. We don't have a lot of work to port scripts.

Attached is a patch updating what is needed. I used the opportunity to fix the bugs that I found.

What is missing:

I didn't bother with the userreport server which is completely outdated. @vladislavbelov will upload the current code for the server at some point.
I should use the opportunity to set svn:executable on some files.

Test Plan

Test the updated scripts.

I noticed that the fontbuilder (with or without the patch) produces slightly different output from what is currently versioned. Maybe we should update the built fonts.

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Itms created this revision.Dec 22 2019, 8:19 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/866/display/redirect

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1382/display/redirect

Harbormaster completed remote builds in B10467: Diff 10743.Dec 22 2019, 8:23 PM

Stan awarded a token.Dec 22 2019, 8:26 PM

See also D506?

In D2501#104715, @Freagarach wrote:

See also D506?

Yes indeed! As mentioned above updating the translation scripts depends on the pology devs. So when I know more, I'll commit this and then I'll commandeer and commit D506 to port the translation scripts.

Stan added a subscriber: Stan.Dec 23 2019, 12:01 PM

Stan added inline comments.

source/tools/fontbuilder2/fontbuilder.py
114 ↗	(On Diff #10743)	Trailing ';'

asterix updated the Trac tickets for this revision.Mar 17 2020, 8:47 AM

wraitii mentioned this in D2757: i18n scripts - switch from pology to Babel for .POT generation and update to python3.May 22 2020, 12:17 PM

Stan added a subscriber: Nescio.Nov 10 2020, 2:13 PM

Stan added inline comments.

source/tools/selectiontexgen/selectiontexgen.py
1 ↗	(On Diff #10743)	I had no idea this file existed... Refs D2503 by @Nescio Not sure we need it anymore.

About Pology, the port to Python 3 will take some time (seeing how the last commit is mine). So, if you find any kind of replacement, you might want to consider porting away from Pology, at least for the time being.

wraitii edited the summary of this revision. (Show Details)Dec 2 2020, 11:07 AM

Stan mentioned this in D3495: specify python2 in fontbuilder readme.Jan 28 2021, 9:02 PM

This revision was not accepted when it landed; it landed in state Needs Review.Feb 12 2021, 10:25 PM

Closed by commit rP24892: Port remaining python2 helper scripts to python3, fixes #5694. (authored by Itms). · Explain Why

This revision was automatically updated to reflect the committed changes.

Itms added a commit: rP24892: Port remaining python2 helper scripts to python3, fixes #5694..

Owners added a subscriber: Restricted Owners Package.Feb 12 2021, 10:25 PM