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

Fallback to ImageMagick (with subprocess) if PIL is not available #27

Merged
merged 1 commit into from
Mar 19, 2018
Merged

Conversation

depau
Copy link
Contributor

@depau depau commented Feb 25, 2018

PyPy on ARM has some troubles with Pillow (see fabianonline/OctoPrint-Telegram#115).

This PR makes it optional: it continues to depend on it, however, if there's an ImportError, it uses ImageMagick instead.

@CoDanny CoDanny merged commit 8b44c30 into AstroPrint:master Mar 19, 2018
@depau depau deleted the nopillow branch March 20, 2018 13:45
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