[3.7] bpo-41306: Allow scale value to not be rounded (GH-21715) - #96484
Merged
ned-deily merged 1 commit intoSep 1, 2022
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
This fixes the test failure with Tk 6.8.10 which is caused by changes to how Tk rounds the `from`, `to` and `tickinterval` arguments. This PR uses `noconv` if the patchlevel is greater than or equal to 8.6.10 (credit to Serhiy for this idea as it is much simpler than what I previously proposed). Going into more detail for those who want it, the Tk change was made in [commit 591f68c](tcltk/tk@591f68c) and means that the arguments listed above are rounded relative to the value of `from`. However, when rounding the `from` argument ([line 623](https://github.com/tcltk/tk/blob/591f68cb382525b72664c6fecaab87742b6cc87a/generic/tkScale.cGH-L623)), it is rounded relative to itself (i.e. rounding `0`) and therefore the assigned value for `from` is always what is given (no matter what values of `from` and `resolution`). Automerge-Triggered-By: @pablogsal (cherry picked from commit aecf036) Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
Copy link
Copy Markdown
Contributor
Author
|
Status check is done, and it's a success ✅ . |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
This should fix a test failure that is blocking CI on the 3.7 branch. (await CI results to find out) |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Author
|
Status check is done, and it's a success ✅ . |
Sorry, something went wrong.
ned-deily
approved these changes
Sep 1, 2022
Copy link
Copy Markdown
Contributor
Author
|
Sorry, I can't merge this PR. Reason: You're not authorized to push to this branch. Visit https://docs.github.com/articles/about-protected-branches/ for more information.. |
Sorry, something went wrong.
This file contains hidden or 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
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 fixes the test failure with Tk 6.8.10 which is caused by changes to how Tk rounds the from, to and tickinterval arguments. This PR uses noconv if the patchlevel is greater than or equal to 8.6.10 (credit to Serhiy for this idea as it is much simpler than what I previously proposed).
Going into more detail for those who want it, the Tk change was made in commit 591f68c and means that the arguments listed above are rounded relative to the value of from. However, when rounding the from argument (line 623), it is rounded relative to itself (i.e. rounding 0) and therefore the assigned value for from is always what is given (no matter what values of from and resolution).
Automerge-Triggered-By: @pablogsal
(cherry picked from commit aecf036)
Co-authored-by: E-Paine 63801254+E-Paine@users.noreply.github.com