Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport bug fix to 7.0.1 #987

Merged
merged 2 commits into from
Jul 10, 2020
Merged

Backport bug fix to 7.0.1 #987

merged 2 commits into from
Jul 10, 2020

Conversation

kitchoi
Copy link
Contributor

@kitchoi kitchoi commented Jul 10, 2020

This PR:

Note that this is targeting the maint/7.0 branch.

kitchoi and others added 2 commits July 10, 2020 15:43
* Add a test for #790 (they are now passing with traits 6.0 and 6.1)

* Add two failing tests for #983

* Revert "Move format_func, format_str and invalid traits from factory to editor (#859)"

This reverts commit 0617cea.

* Skip the test that will fail on traits<6.1.0 after reverting #859. Test should pass with traits >= 6.1.0

* Fix a comment in tests
@kitchoi kitchoi requested a review from rahulporuri July 10, 2020 14:47
Copy link
Contributor

@rahulporuri rahulporuri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with one small comment.

@@ -21,8 +21,6 @@ Fixes
(#848)
* Fix demo application description (#850)
* Fix auto-add functionality in ListStrModel (#860)
* Move format_func, format_str and invalid traits from factory to editor
(#859, #900)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we only reverted #859 , not #900 as well. right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right.
The issue fixed by #900 was directly caused by #859 though. With #859 reverted, #900 isn't fixing anything visible to the users. We did not need to revert #900 either, because the change there can stay in its own right (it is correcting a function signature trying to ducktype the editor class's __init__).

@kitchoi kitchoi merged commit 04740d8 into maint/7.0 Jul 10, 2020
@kitchoi kitchoi deleted the backport-bug-fix-to-7.0.1 branch July 10, 2020 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants