Skip to content

Backport recent PRs to maintenance branch#845

Merged
aaronayres35 merged 2 commits into
maint/5.2from
backport-recent-prs
Jun 11, 2021
Merged

Backport recent PRs to maintenance branch#845
aaronayres35 merged 2 commits into
maint/5.2from
backport-recent-prs

Conversation

@aaronayres35
Copy link
Copy Markdown
Contributor

These two PRs were recently merged into master but can be included in the 5.2.0 release.

aaronayres35 and others added 2 commits June 10, 2021 10:53
* remove __getstate__ methods and use transient metadata

* remove _scroll_origin

* Update enable/abstract_window.py

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>
* set transient metadata on traits who (according to subclasses) should be transient

* import Int

* actually we do need getstate because stack_index is a class attribute.  Pull getstate method down here to the baseclass

* remove PICKLE FIXME comment

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>
Copy link
Copy Markdown
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

@aaronayres35 aaronayres35 merged commit fd886ab into maint/5.2 Jun 11, 2021
@aaronayres35 aaronayres35 deleted the backport-recent-prs branch June 11, 2021 11:55
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