Corrected check for libtiff feature #7975
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
|
Should we use |
|
Ok, I've updated the commit. |
nulano
reviewed
Apr 15, 2024
Tests/test_tiff_ifdrational.py
Outdated
| @pytest.mark.parametrize( | ||
| "libtiff", (pytest.param(True, marks=skip_unless_feature("libtiff")), False) | ||
| ) | ||
| def test_ifd_rational_save(tmp_path: Path, libtiff: bool) -> None: |
There was a problem hiding this comment.
Suggested change
| def test_ifd_rational_save(tmp_path: Path, libtiff: bool) -> None: | |
| def test_ifd_rational_save(monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool) -> None: |
Tests/test_tiff_ifdrational.py
Outdated
| out = str(tmp_path / "temp.tiff") | ||
| res = IFDRational(301, 1) | ||
| im.save(out, dpi=(res, res), compression="raw") | ||
| TiffImagePlugin.WRITE_LIBTIFF = libtiff |
There was a problem hiding this comment.
Suggested change
| TiffImagePlugin.WRITE_LIBTIFF = libtiff | |
| monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", libtiff) |
Tests/test_tiff_ifdrational.py
Outdated
| im.save(out, dpi=(res, res), compression="raw") | ||
| TiffImagePlugin.WRITE_LIBTIFF = libtiff | ||
| im.save(out, dpi=(res, res), compression="raw") | ||
| TiffImagePlugin.WRITE_LIBTIFF = False |
There was a problem hiding this comment.
Suggested change
| TiffImagePlugin.WRITE_LIBTIFF = False |
|
I've pushed a commit to use monkeypatch whenever the tests set |
nulano
reviewed
Apr 18, 2024
Tests/test_file_libtiff.py
Outdated
| @@ -756,10 +747,9 @@ def check_write(libtiff: bool) -> None: | |||
| with Image.open(out) as reloaded: | |||
| assert icc_profile == reloaded.info["icc_profile"] | |||
|
|
|||
| libtiffs = [] | |||
| libtiffs = [False] | |||
| if Image.core.libtiff_support_custom_tags: | |||
| libtiffs.append(True) | |||
There was a problem hiding this comment.
This can also use pytest.mark.parametrize
nulano
approved these changes
Apr 19, 2024
Tests/test_imagesequence.py
Outdated
| def test_libtiff() -> None: | ||
| TiffImagePlugin.READ_LIBTIFF = True | ||
| def test_libtiff(monkeypatch: pytest.MonkeyPatch) -> None: | ||
| monkeypatch.setattr(TiffImagePlugin, "READ_LIBTIFF", True) | ||
| _test_multipage_tiff() |
There was a problem hiding this comment.
While not as useful, these two tests can also be combined into one with pytest.mark.parametrize for slightly shorter code.
nulano
approved these changes
Apr 19, 2024
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.
Pillow/Tests/test_tiff_ifdrational.py
Lines 55 to 61 in db21e7d
This is the wrong way around.
WRITE_LIBTIFFshould beTruewhen libtiff is available.To demonstrate, if I skip building libtiff on Windows, it fails. With this change, it passes.