gh-124111 Update tkinter to use TclTk 8.6.15 or 9.0.0 #124156

culler · 2024-09-17T04:40:56Z

This PR updates tkinter, ttk, test.test_tkinter and test.test_ttk to make them work and pass tests when built against either TclTk 8.6.15, which was released today, or TclTk 9.0.0 which currently has a release candidate and will be released soon. The changes to the tests include some re-organization to make it easier to accommodate expected development of Tk 9, particularly with respect to the new TclObject of type "pixels" used in Tk 9 for options whose values represent screen distances.

Please also see the discussion on PR #124112.

Note that, unlike #124112, this PR targets Python 3.14.

Issue: Update tkinter to use Tk 8.6.15 or (better) Tk 9.0 #124111

bedevere-app · 2024-09-17T04:41:04Z

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

bedevere-app · 2024-09-17T04:48:38Z

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

zooba

Do you know why your generated files look like they're completely changed? It is line endings being bad? (I believe our regen scripts assume you're using autocrlf on Windows.)

PCbuild/tcltk.props

…tting.

culler · 2024-09-19T16:38:05Z

Do you know why your generated files look like they're completely changed? It is line endings being bad? (I believe our regen scripts assume you're using autocrlf on Windows.)

I have no idea. I committed those by mistake, since I am used to using git commit -a. It has something to do with Windows - those files were not changed by other platforms.

I think I have now restored the autogenerated files that I committed by mistake.

zware

Looking good! I have some comments that are mostly style nits, and I think we may want to hold off on the changes to PCbuild/. I don't think we'll be able to move the Windows builds for <=3.13 to Tcl/Tk 9 (at least not immediately), so it will make backporting the other changes easier to leave the 3.14 PCbuild/ updates to a separate PR.

Thanks!

Lib/test/test_tkinter/test_misc.py

Lib/test/test_tkinter/test_widgets.py

Lib/test/test_tkinter/widget_tests.py

Lib/test/test_ttk/test_widgets.py

…pped and _no_round.

culler · 2024-09-20T16:38:46Z

I think I have now addressed all issues raised in the comments. Is there anything else that is needed?

zooba · 2024-09-23T15:09:09Z

We don't want example files in the build directory. To "save" the changes for later, they could either be a draft PR, comments in the file (not preferred), or you could add the changes with Condition="$(TclMajorVersion) == '9'" checks so that they automatically apply when building against 9.0 (preferred).¹

Number comparisons are a bit wonky in MSBuild, so usually just best to pick the most sensible default. In this case, it's probably actually to check $(TclMajorVersion) == '8' for the old behaviour, so that when 10.0 comes out it'll get the newer behaviours. ↩

culler · 2024-09-23T15:34:12Z

We don't want example files in the build directory. To "save" the changes for later, they could either be a draft PR, comments in the file (not preferred), or you could add the changes with Condition="$(TclMajorVersion) == '9'" checks so that they automatically apply when building against 9.0 (preferred).1

Footnotes
1. Number comparisons are a bit wonky in MSBuild, so usually just best to pick the most sensible default. In this case, it's probably actually to check `$(TclMajorVersion) == '8'` for the old behaviour, so that when 10.0 comes out it'll get the newer behaviours. [↩](#user-content-fnref-1-9d9cf4f3af8602fa729bad031ef1ba2c)

Sure. I will attempt to modify _tkinter.vcxproj to allow building against either 8.6.14 or 9.0.0. (Note that 8.6.15 has been released, but the binaries are not available to get_externals.bat yet.)

…9_for_python314

…ersion by setting the TclVersion environment variable

culler · 2024-09-23T21:58:27Z

I have removed the "examples" and modified the build scripts to use the TclVersion environment variable to decide which Tk version gets used for the build. (The version must also be installed in ../externals/tcltk-W.X.Y.Z, which can either be done locally or by the get_externals script. I tested on my machine and was able to build both for Tk 8.6.14 (using the binaries downloaded by get_externals) and for Tk 9.0.0.0 (installed by me, by setting the INSTALLDIR variable in a standaard build of Tcl and Tk with nmake and makefile.vc).

zware

Some of these changes cause failures for me on Pop_OS! 22.04 (Ubuntu 22.04 derivative) with Tcl/Tk 9.0.0b3. It's possible that I'm getting my configuration wrong, but switching to Tcl/Tk 9.0.0b3 without this PR causes one failure, then adding these changes introduces a bunch of other failures, mostly around rounding as far as I can tell.

zware · 2024-09-20T17:15:58Z

Lib/test/test_tkinter/test_widgets.py

+    add_configure_tests,
+    AbstractWidgetTest,
+    StandardOptionsTests,
+    IntegerSizeTests, PixelSizeTests)


Nit: let's not stop here :)

Suggested change

IntegerSizeTests, PixelSizeTests)

IntegerSizeTests,

PixelSizeTests,

)

Lib/test/test_ttk/test_widgets.py

zware · 2024-09-20T17:26:23Z

Lib/test/test_tkinter/widget_tests.py

+            if tk_version < (9,0):
+                errmsg = 'font "" doesn\'t exist'
+            else:
+                errmsg = 'font "" does not exist'


Nit: checkInvalidParam uses assertRaisesRegex, so we should be able to simplify:

Suggested change

if tk_version < (9,0):

errmsg = 'font "" doesn\'t exist'

else:

errmsg = 'font "" does not exist'

errmsg = 'font "" does ?n[o\']t exist'

Lib/test/test_ttk/test_widgets.py

culler · 2024-09-23T23:55:52Z

Some of these changes cause failures for me on Pop_OS! 22.04 (Ubuntu 22.04 derivative) with Tcl/Tk 9.0.0b3. It's possible that I'm getting my configuration wrong, but switching to Tcl/Tk 9.0.0b3 without this PR causes one failure, then adding these changes introduces a bunch of other failures, mostly around rounding as far as I can tell.

I am getting no failures on Ubuntu 22.04. I think that you are probably using the released 9.0.b3 while I am using the tips of main branches of the fossil repositories for Tcl and Tk. (I did that because they presumably are closer to the actual 9.0.0 releases.) There have been recent changes to how some of the widgets handle rounding.

I am using commits 8627aad9bd for Tcl and d2f53df7a8 for Tk. (Both from 9/23)

Note: part of what I am trying to do here is to make it easier to adjust the tests as these sorts of changes happen. I think the plan is that eventually all of these options will be rounded. Also more options will be changed to accept pixel values (e.g. 10p or 23m).

zware · 2024-09-24T00:00:51Z

Ahh, that makes sense. It also makes me think we probably want to sit on this until 9.0 is actually released or has at least had a release candidate, though :-/

culler · 2024-09-24T00:09:04Z

Ahh, that makes sense. It also makes me think we probably want to sit on this until 9.0 is actually released or has at least had a release candidate, though :-/

Sure. A release candidate is imminent. The core-9-0-0-rc branch is being finalized right now.

culler · 2024-09-24T18:12:25Z

I switched to the tip of the core-9-0-0-rc branches of Tcl and Tk and reran the tkinter and ttk tests on Ubuntu 22.04, I still am seeing no errors.

Addendum 1: Also no errors on Windows 11 with the tips of the core-9-0-0-rc branches.

Addendum2: Also no errors on macOS 14 with the tips of the cre-9-0-0-rc branches.

Addendum3: The third Tcl 9.0.0.0 release candidate is now available here. I expect the final release will happen in the next week or two.

…9_for_python314

culler · 2024-09-25T17:08:19Z

I think this PR is finished. The PR checks test against Tcl/Tk 8.6.14, and they are showing no failures. I have tested against Tcl/Tk 8.6.15 and Tcl/Tk 9.0.0 (rc2) on my own machines, running Ubuntu 22.04, Windows 11, and macOS 14. There are no failures in those 6 cases. The issue reported in #124378 with 8.6.15 has been resolved here.

The release of Tcl/Tk 9.0.0 is expected within a week, and surely will happen by the end of next week.

zware

This is great, thank you! I'm satisfied with this change overall, but I think we should get a once-over from @serhiy-storchaka for the tkinter changes and a final confirmation from @zooba that the PCbuild/ changes match his expectations.

With your permission, I'd like to extract your ttk Notebook test fixes to a separate PR so that we can go ahead with it and get it backported. (If you would prefer to make that split yourself, that works for me.)

I expect that we will eventually be backporting this whole PR even if we don't start shipping 9.0 with our <3.14 binaries because at some point our non-Windows CI systems will inevitably update to 9.0, but I'm not sure how quickly that will happen and want to be sure we get 8.6.15 supported as soon as we can.

Lib/test/test_tkinter/test_misc.py

zware · 2024-09-25T17:38:08Z

Lib/test/test_tkinter/support.py

@@ -112,6 +113,10 @@ def get_tk_patchlevel(root):
 def pixels_conv(value):
    return float(value[:-1]) * units[value[-1:]]

+pix_re = re.compile(r'[0-9]*\.?[0-9]*[cimp]{1}')
+def is_pixel_str(x):
+    return pix_re.fullmatch(x) != None


Nit: this doesn't seem to be used anymore.

culler · 2024-09-25T18:15:25Z

This is great, thank you! I'm satisfied with this change overall, but I think we should get a once-over from @serhiy-storchaka for the tkinter changes and a final confirmation from @zooba that the PCbuild/ changes match his expectations.

Thanks! That sounds good,

With your permission, I'd like to extract your ttk Notebook test fixes to a separate PR so that we can go ahead with it and get it backported. (If you would prefer to make that split yourself, that works for me.)

By all means. I would prefer to have you handle the split.

I expect that we will eventually be backporting this whole PR even if we don't start shipping 9.0 with our <3.14 binaries because at some point our non-Windows CI systems will inevitably update to 9.0, but I'm not sure how quickly that will happen and want to be sure we get 8.6.15 supported as soon as we can.

Great!

culler · 2024-09-25T20:10:05Z

According to this email the release of Tcl/Tk 9.0.0.0 will happen tomorrow.

Addendum: Tcl/Tk 9.0.0.0 were in fact released today 2/26/2024 as scheduled.

culler added 2 commits September 16, 2024 18:14

New branch for PR against Python 3.14.

797ab58

Ttk tests on linux

03ccc1b

bedevere-app bot added the awaiting review label Sep 17, 2024

bedevere-app bot mentioned this pull request Sep 17, 2024

Update tkinter to use Tk 8.6.15 or (better) Tk 9.0 #124111

Open

Remove trailing whitespace.

d7fdc88

culler added 2 commits September 17, 2024 10:39

Add NEWS file.

9fe5e01

Make Windows build work; adjust for new changes to Canvas.

144c754

culler requested a review from a team as a code owner September 19, 2024 16:11

zooba reviewed Sep 19, 2024

View reviewed changes

PCbuild/tcltk.props Outdated Show resolved Hide resolved

PCbuild/tcltk.props Outdated Show resolved Hide resolved

Attempt to restore autogenerated files that git tricked me into commi…

3b21086

…tting.

Revert other autogenerated files committed by mistake

485e38a

zware reviewed Sep 19, 2024

View reviewed changes

Lib/test/test_tkinter/test_misc.py Outdated Show resolved Hide resolved

Lib/test/test_tkinter/test_widgets.py Outdated Show resolved Hide resolved

Lib/test/test_tkinter/widget_tests.py Outdated Show resolved Hide resolved

Lib/test/test_ttk/test_widgets.py Outdated Show resolved Hide resolved

culler added 7 commits September 19, 2024 14:06

Revert one more autogenerated file committed by mistake

5a954ec

Reference for combobox issue; address conditional definitions of _cli…

50d6958

…pped and _no_round.

Revert PCbuild changes; add examples for tk 9

ee186de

Adjust no_round for Canvas and Scrollbar.

1318d04

Adjust _clipped for Canvas once more.

e68994f

Hmmm = Canvas does clip highlightthickness.

c069c89

Remove message catalog.

8072c54

culler requested a review from zware September 20, 2024 16:38

Force checks to rerun since CLA signing seems hung. (No changes.)

ec56443

culler force-pushed the tk9_for_python314 branch from 8072c54 to ec56443 Compare September 21, 2024 02:06

culler added 2 commits September 23, 2024 11:39

Merge branch 'tk9_for_python314' of github.com:culler/cpython into tk…

4f753f8

…9_for_python314

Update build files to use Tcl/Tk 8.6.14 by default but to allow any v…

bf2243f

…ersion by setting the TclVersion environment variable

zware reviewed Sep 23, 2024

View reviewed changes

Add changes suggested by @zware

77396d8

Remove trailing whitespace.

cf9b947

zware mentioned this pull request Sep 24, 2024

New test_ttk failure on Mac: "bad screen distance" #124378

Open

culler added 4 commits September 24, 2024 22:17

Deal with test_configure_width and test_configure_height for Notebooks.

2ef001b

Merge branch 'tk9_for_python314' of github.com:culler/cpython into tk…

cc50039

…9_for_python314

Need to make tests pass with 8.6.14 too, for the PR checks.

6a9ebc1

Fix version tests in NotebookTest

406aeff

zware approved these changes Sep 25, 2024

View reviewed changes

bedevere-app bot added awaiting merge and removed awaiting review labels Sep 25, 2024

Include changes suggested by @zware

5edecc1

culler requested a review from zooba September 25, 2024 18:29

zware requested a review from serhiy-storchaka September 25, 2024 18:36

zware mentioned this pull request Sep 25, 2024

gh-124378: Update test_ttk for Tcl/Tk 8.6.15 #124542

Merged

Merge branch 'main' into tk9_for_python314

f661969

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gh-124111 Update tkinter to use TclTk 8.6.15 or 9.0.0 #124156

gh-124111 Update tkinter to use TclTk 8.6.15 or 9.0.0 #124156

culler commented Sep 17, 2024 •

edited by bedevere-app bot

Loading

bedevere-app bot commented Sep 17, 2024

bedevere-app bot commented Sep 17, 2024

zooba left a comment

culler commented Sep 19, 2024 •

edited

Loading

zware left a comment

culler commented Sep 20, 2024

zooba commented Sep 23, 2024

culler commented Sep 23, 2024

Footnotes

culler commented Sep 23, 2024

zware left a comment

zware Sep 20, 2024

culler Sep 23, 2024

zware Sep 20, 2024

culler Sep 23, 2024

culler commented Sep 23, 2024

zware commented Sep 24, 2024

culler commented Sep 24, 2024

culler commented Sep 24, 2024 •

edited

Loading

culler commented Sep 25, 2024

zware left a comment

zware Sep 25, 2024

culler commented Sep 25, 2024

culler commented Sep 25, 2024 •

edited

Loading

gh-124111 Update tkinter to use TclTk 8.6.15 or 9.0.0 #124156

Are you sure you want to change the base?

gh-124111 Update tkinter to use TclTk 8.6.15 or 9.0.0 #124156

Conversation

culler commented Sep 17, 2024 • edited by bedevere-app bot Loading

bedevere-app bot commented Sep 17, 2024

bedevere-app bot commented Sep 17, 2024

zooba left a comment

Choose a reason for hiding this comment

culler commented Sep 19, 2024 • edited Loading

zware left a comment

Choose a reason for hiding this comment

culler commented Sep 20, 2024

zooba commented Sep 23, 2024

Footnotes

culler commented Sep 23, 2024

Footnotes

culler commented Sep 23, 2024

zware left a comment

Choose a reason for hiding this comment

zware Sep 20, 2024

Choose a reason for hiding this comment

culler Sep 23, 2024

Choose a reason for hiding this comment

zware Sep 20, 2024

Choose a reason for hiding this comment

culler Sep 23, 2024

Choose a reason for hiding this comment

culler commented Sep 23, 2024

zware commented Sep 24, 2024

culler commented Sep 24, 2024

culler commented Sep 24, 2024 • edited Loading

culler commented Sep 25, 2024

zware left a comment

Choose a reason for hiding this comment

zware Sep 25, 2024

Choose a reason for hiding this comment

culler commented Sep 25, 2024

culler commented Sep 25, 2024 • edited Loading

culler commented Sep 17, 2024 •

edited by bedevere-app bot

Loading

culler commented Sep 19, 2024 •

edited

Loading

culler commented Sep 24, 2024 •

edited

Loading

culler commented Sep 25, 2024 •

edited

Loading