Skip to content

Commit c867219

Browse files
Merge pull request #5133 from neutrinoceros/cln/cleanup_conftest.py
CLN: cleanup unused warning filters in conftest.py
2 parents 5ea7043 + 5b93f48 commit c867219

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

conftest.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
data_dir_load,
2121
)
2222

23-
MPL_VERSION = Version(version("matplotlib"))
2423
NUMPY_VERSION = Version(version("numpy"))
25-
PILLOW_VERSION = Version(version("pillow"))
2624

2725
# setuptools does not ship with the standard lib starting in Python 3.12, so we need to
2826
# be resilient if it's not available at runtime
@@ -136,19 +134,6 @@ def pytest_configure(config):
136134
"ignore:pkg_resources is deprecated as an API:DeprecationWarning",
137135
)
138136

139-
if MPL_VERSION < Version("3.5.2") and PILLOW_VERSION >= Version("9.1"):
140-
# see https://github.com/matplotlib/matplotlib/pull/22766
141-
config.addinivalue_line(
142-
"filterwarnings",
143-
r"ignore:NONE is deprecated and will be removed in Pillow 10 \(2023-07-01\)\. "
144-
r"Use Resampling\.NEAREST or Dither\.NONE instead\.:DeprecationWarning",
145-
)
146-
config.addinivalue_line(
147-
"filterwarnings",
148-
r"ignore:ADAPTIVE is deprecated and will be removed in Pillow 10 \(2023-07-01\)\. "
149-
r"Use Palette\.ADAPTIVE instead\.:DeprecationWarning",
150-
)
151-
152137
if NUMPY_VERSION >= Version("1.25"):
153138
if find_spec("h5py") is not None and (
154139
Version(version("h5py")) < Version("3.9")

0 commit comments

Comments
 (0)