[24.0] Fix conditional Image imports #17899
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mvdbeek
force-pushed
the
fix_basic_tool_util
branch
from
f557402 to
d331cc2
Compare
bernt-matthias
approved these changes
Apr 4, 2024
|
I was looking at that ;). I did release a new planemo version with the current master branch though, we can re-run the qiime2 workflow tests to see if that's rendered properly now. |
nsoranzo
reviewed
Apr 4, 2024
| @@ -31,7 +31,7 @@ | |||
| try: | |||
| from PIL import Image | |||
| except ImportError: | |||
| pass | |||
| Image = None # type: ignore[assignment] | |||
There was a problem hiding this comment.
I changed this to pass on purpose since in the rest of this file we are not handling the case where Image is None (as we instead do in lib/galaxy/util/image_util.py), so a NameError: name 'Image' is not defined exception is better than a AttributeError: 'NoneType' object has no attribute 'open' one.
No need to change it back anyway, and thanks for the other fix (backport of #17749 ).
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
How to test the changes?
(Select all options that apply)
License