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

Optional opencv #43

Merged
merged 4 commits into from
Aug 28, 2018
Merged

Optional opencv #43

merged 4 commits into from
Aug 28, 2018

Conversation

pllim
Copy link
Member

@pllim pllim commented Aug 24, 2018

Fix #31

Also moved dev notes to https://github.com/astropy/astrowidgets/wiki/DevNotes and added link to example notebook to docs.

@pllim pllim added the enhancement New feature or request label Aug 24, 2018
@pllim pllim requested review from eteq and mwcraig August 24, 2018 21:00
@pllim
Copy link
Member Author

pllim commented Aug 24, 2018

Huh... Will have to investigate failure later... https://travis-ci.org/astropy/astrowidgets/jobs/420294263

Copy link
Member

@mwcraig mwcraig left a comment

Choose a reason for hiding this comment

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

Just one minor change....

try:
from ginga import trcalc
trcalc.use('opencv')
except (ImportError, ModuleNotFoundError) as exc:
Copy link
Member

Choose a reason for hiding this comment

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

Looks like ModuleNotFoundError is Python 3.6 and up only...but it subclasses from ImportError so just catching ImportError should be enough.

@pllim
Copy link
Member Author

pllim commented Aug 28, 2018

Thanks for the help, @mwcraig ! Tests pass now. 🎉

@mwcraig
Copy link
Member

mwcraig commented Aug 28, 2018

Thanks, merging! Hoping to put some concentrated time into this later this week/weekend.

@mwcraig mwcraig merged commit bde6efc into astropy:master Aug 28, 2018
@pllim pllim deleted the optional-opencv branch August 28, 2018 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants