Merge pull request #3010 from djhoese/remove-pytest8-limit

pytroll · Dec 6, 2024 · 2857fbc · 2857fbc
2 parents 56b3341 + 1880cf4
commit 2857fbc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml
@@ -43,7 +43,7 @@ dependencies:
   - python-eccodes
   # 2.19.1 seems to cause library linking issues
   - eccodes>=2.20
-  - pytest<8.0.0
+  - pytest
   - pytest-cov
   - fsspec
   - botocore>=1.33

diff --git a/satpy/tests/modifier_tests/test_parallax.py b/satpy/tests/modifier_tests/test_parallax.py
@@ -18,6 +18,7 @@
 import math
 import os
 import unittest.mock
+import warnings
 
 import dask.array as da
 import dask.config
@@ -368,13 +369,13 @@ def test_correct_area_clearsky_different_resolutions(self, res1, res2):
             resolution=res2,
             area_extent=[-1, -1, 1, 1])
 
-        with pytest.warns(None) as record:
+        with warnings.catch_warnings():
+            warnings.simplefilter("error")
             sc = make_fake_scene(
                     {"CTH_clear": np.full(area1.shape, np.nan)},
                     daskify=False,
                     area=area1,
                     common_attrs=_get_attrs(0, 0, 35_000))
-        assert len(record) == 0
 
         corrector = ParallaxCorrection(area2)
         new_area = corrector(sc["CTH_clear"])