Skip to content

Use ArrayOrNone#350

Merged
rkern merged 5 commits into
masterfrom
fix/array-or-none
Jun 26, 2017
Merged

Use ArrayOrNone#350
rkern merged 5 commits into
masterfrom
fix/array-or-none

Conversation

@rkern
Copy link
Copy Markdown
Member

@rkern rkern commented Apr 11, 2017

Fixes all of the instances of FutureWarning: comparison to `None` will result in an elementwise object comparison in the future. that I could find.

Additionally clean up a few warnings so that we have a clean test suite.

Copy link
Copy Markdown

@cfarrow cfarrow left a comment

Choose a reason for hiding this comment

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

Sorry for being pedantic about the comments. I'm teaching this week. :)

Other than these comments and the test failure, LGTM.

Comment thread chaco/tools/range_selection.py Outdated
@@ -133,7 +133,7 @@ class RangeSelection(AbstractController):

# The data space start and end coordinates of the selected region,
# expressed as a list.
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This comment is out of date.



class TestArrayOrNone(unittest.TestCase):
""" Test that the FutureWarning from numpy concerning comparison of arrays
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

It would be helpful to expand upon this to include the numpy version where this is a warning and the version where it will become an exception.

@cfarrow
Copy link
Copy Markdown

cfarrow commented Apr 14, 2017

The test failure is on python 3.4 using qt4. It appears to be due to a setup issue with pyside (perhaps this). I've not looked deeper into it.

@rkern
Copy link
Copy Markdown
Member Author

rkern commented Jun 26, 2017

@cfarrow The remaining failures seem to be general problems with the Travis setup.

@cfarrow
Copy link
Copy Markdown

cfarrow commented Jun 26, 2017

Yes. The test failures look unrelated. We can deal with them elsewhere.

@cfarrow
Copy link
Copy Markdown

cfarrow commented Jun 26, 2017

LGTM

@rkern
Copy link
Copy Markdown
Member Author

rkern commented Jun 26, 2017

Note that the last change to get this working with Enable's master due to enthought/enable/pull/250 makes Chaco depend on Enable master. I don't know if that changes your LGTM.

@cfarrow
Copy link
Copy Markdown

cfarrow commented Jun 26, 2017

The next Chaco release will require an Enable release. I'm not too worried about that. Still LGTM

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