From 19c2ba52b2193ed5c774457e95d16f403b160c65 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Fri, 17 May 2024 09:23:44 -0500 Subject: [PATCH] Replace deprecate pytest-lazy-fixture with pytest-lazy-fixtures --- continuous_integration/environment.yaml | 4 ++-- jenkins_environment.yml | 2 +- polar2grid/tests/test_filters/test_utils.py | 2 +- polar2grid/tests/test_glue.py | 2 +- polar2grid/tests/test_resample/test_resample_scene.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml index dab5c24f..852bcb83 100644 --- a/continuous_integration/environment.yaml +++ b/continuous_integration/environment.yaml @@ -37,9 +37,8 @@ dependencies: - scipy - zarr - xarray - - pytest <8.0 + - pytest - pytest-cov - - pytest-lazy-fixture - sphinx - pip - python-graphviz @@ -48,6 +47,7 @@ dependencies: - s3fs - sphinxcontrib-apidoc - pip: + - pytest-lazy-fixtures - git+https://github.com/pytroll/satpy.git - git+https://github.com/pytroll/pyresample.git - git+https://github.com/djhoese/sphinx-argparse.git@bugfix-section-nums diff --git a/jenkins_environment.yml b/jenkins_environment.yml index 209a3861..bc397661 100644 --- a/jenkins_environment.yml +++ b/jenkins_environment.yml @@ -7,9 +7,9 @@ dependencies: - pip - sphinx - pytest - - pytest-lazy-fixture - matplotlib - pip: + - pytest-lazy-fixtures - graphviz # - sphinx-argparse - git+https://github.com/djhoese/sphinx-argparse.git@bugfix-section-nums diff --git a/polar2grid/tests/test_filters/test_utils.py b/polar2grid/tests/test_filters/test_utils.py index e3d40527..61571bbf 100644 --- a/polar2grid/tests/test_filters/test_utils.py +++ b/polar2grid/tests/test_filters/test_utils.py @@ -28,7 +28,7 @@ import pytest from pyresample import SwathDefinition from pyresample.boundary import AreaBoundary, Boundary -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy.tests.utils import CustomScheduler from polar2grid.filters._utils import boundary_for_area diff --git a/polar2grid/tests/test_glue.py b/polar2grid/tests/test_glue.py index a7402b4e..f09ebb94 100644 --- a/polar2grid/tests/test_glue.py +++ b/polar2grid/tests/test_glue.py @@ -31,7 +31,7 @@ import dask import pytest import yaml -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy.tests.utils import CustomScheduler from polar2grid.utils.config import get_polar2grid_etc diff --git a/polar2grid/tests/test_resample/test_resample_scene.py b/polar2grid/tests/test_resample/test_resample_scene.py index 8632e5b9..12e3fe49 100644 --- a/polar2grid/tests/test_resample/test_resample_scene.py +++ b/polar2grid/tests/test_resample/test_resample_scene.py @@ -27,7 +27,7 @@ import dask import pytest from pyresample.geometry import SwathDefinition -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy import Scene from satpy.resample import DaskEWAResampler, KDTreeResampler, NativeResampler from satpy.tests.utils import CustomScheduler