Skip to content

Backport PRs #421, #422 and #423#427

Merged
rahulporuri merged 4 commits into
maint/6.0from
backport-421-422-423
Jun 17, 2021
Merged

Backport PRs #421, #422 and #423#427
rahulporuri merged 4 commits into
maint/6.0from
backport-421-422-423

Conversation

@rahulporuri
Copy link
Copy Markdown
Contributor

@rahulporuri rahulporuri commented Jun 17, 2021

This PR backports the following PRs back to the maint/6.0 branch in preparation for the 6.0.1 release - #421 , #422 and #423 . #422 reverted the original PR that is the cause of #417 , #421 adds a regression test for #417 and #423 ensures that the testsuite passes cleanly with minimal dependencies.

This PR also updates the changelog in preparation for the upcoming release. Once this PR is merged, we will be in a place to make the 6.0.1 release.

Poruri Sai Rahul and others added 4 commits June 17, 2021 17:09
* Revert "Support observe("name:items") for ExtensionPoint [Requires Traits 6.1] (#354)"

This reverts commit d62af08.

* TST/FIX : Revert test that used observe to listen to changes to

extension point items. The test now uses a static trait change handler
like before

	modified:   envisage/tests/test_plugin.py
* Add failing test

* STY: Fix line spacing issues

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>
* Fix hard test suite dependence on ipykernel

* Update envisage/tests/test_ids.py

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

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>
	modified:   CHANGES.rst
@rahulporuri rahulporuri requested a review from aaronayres35 June 17, 2021 11:48
Copy link
Copy Markdown
Contributor

@aaronayres35 aaronayres35 left a comment

Choose a reason for hiding this comment

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

LGTM

Looks like we settled on a bug fix not minor release. That works for me

@rahulporuri
Copy link
Copy Markdown
Contributor Author

Looks like we settled on a bug fix not minor release

Yup. We (@mdickinson ) settled on that because we're fixing a broken feature (the fix here is to effectively remove the feature).

@rahulporuri rahulporuri merged commit 3a9d807 into maint/6.0 Jun 17, 2021
@rahulporuri rahulporuri deleted the backport-421-422-423 branch June 17, 2021 12:51
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.

3 participants