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

Unpin imageio and add warningfilter #7006

Merged
merged 2 commits into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions TODO.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ Other (2022)
------------
* Remove custom code for ignored warning in `skimage/_shared/testing.py` relating
to (sparse) matricies (instead of arrays).
* Remove warningsfilter for imageio and Pillow once
https://github.com/python-pillow/Pillow/pull/7125 is shipped in the minimal required
version of pillow (probably the release after Pillow 9.5.0).
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies = [
'scipy>=1.8',
'networkx>=2.8',
'pillow>=9.0.1',
'imageio>=2.27,<2.31',
'imageio>=2.27',
'tifffile>=2022.8.12',
'PyWavelets>=1.1.1',
'packaging>=21',
Expand Down Expand Up @@ -72,7 +72,7 @@ default = [
'scipy>=1.8',
'networkx>=2.8',
'pillow>=9.0.1',
'imageio>=2.27,<2.31',
'imageio>=2.27',
'tifffile>=2022.8.12',
'PyWavelets>=1.1.1',
'packaging>=21',
Expand Down
2 changes: 1 addition & 1 deletion requirements/default.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ numpy>=1.21.1
scipy>=1.8
networkx>=2.8
pillow>=9.0.1
imageio>=2.27,<2.31
imageio>=2.27
tifffile>=2022.8.12
PyWavelets>=1.1.1
packaging>=21
Expand Down
13 changes: 13 additions & 0 deletions skimage/_shared/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,19 @@ def setup_test():
category=DeprecationWarning
)

# Temporary warning raised by imageio about change in Pillow. May be removed
# once https://github.com/python-pillow/Pillow/pull/7125 is shipped in the
# minimal required version of pillow (probably the release after Pillow 9.5.0)
warnings.filterwarnings(
"default",
message=(
"Loading 16-bit (uint16) PNG as int32 due to limitations in pillow's "
"PNG decoder. This will be fixed in a future version of pillow which "
"will make this warning dissapear."
),
category=UserWarning,
)

jarrodmillman marked this conversation as resolved.
Show resolved Hide resolved

def teardown_test():
"""Default package level teardown routine for skimage tests.
Expand Down