From 567df9da4651716be9c3e9f9a40e9a652c2b85b4 Mon Sep 17 00:00:00 2001 From: Martin Raspaud Date: Fri, 17 May 2024 08:42:24 +0200 Subject: [PATCH] Replace pytest-lazyfixture with pytest-lazy-fixtures --- continuous_integration/environment.yaml | 2 +- pyproject.toml | 8 ++++---- satpy/tests/reader_tests/modis_tests/test_modis_l1b.py | 2 +- satpy/tests/reader_tests/modis_tests/test_modis_l2.py | 2 +- satpy/tests/reader_tests/modis_tests/test_modis_l3.py | 2 +- satpy/tests/reader_tests/test_abi_l1b.py | 2 +- satpy/tests/reader_tests/test_fci_l1c_nc.py | 2 +- satpy/tests/reader_tests/test_goci2_l2_nc.py | 2 +- satpy/tests/reader_tests/test_seadas_l2.py | 2 +- satpy/tests/reader_tests/test_viirs_edr.py | 2 +- satpy/tests/test_modifiers.py | 2 +- satpy/tests/test_readers.py | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml index 4fc7a508f2..2000efd37f 100644 --- a/continuous_integration/environment.yaml +++ b/continuous_integration/environment.yaml @@ -45,7 +45,6 @@ dependencies: - eccodes>=2.20 - pytest<8.0.0 - pytest-cov - - pytest-lazy-fixture - fsspec - botocore>=1.33 - s3fs @@ -59,6 +58,7 @@ dependencies: - ephem - bokeh - pip: + - pytest-lazy-fixtures - trollsift - trollimage>=1.23 - pyspectral diff --git a/pyproject.toml b/pyproject.toml index 01abbbd1ac..2fa0f27d94 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -83,10 +83,10 @@ hvplot = ["hvplot", "geoviews", "cartopy", "holoviews"] overlays = ["pycoast", "pydecorate"] satpos_from_tle = ["skyfield", "astropy"] tests = ["behave", "h5py", "netCDF4", "pyhdf", "imageio", - "rasterio", "geoviews", "trollimage", "fsspec", "bottleneck", - "rioxarray", "pytest", "pytest-lazy-fixture", "defusedxml", - "s3fs", "eccodes", "h5netcdf", "xarray-datatree", - "skyfield", "ephem", "pint-xarray", "astropy", "dask-image", "python-geotiepoints", "numba"] + "rasterio", "geoviews", "trollimage", "fsspec", "bottleneck", + "rioxarray", "pytest", "pytest-lazy-fixtures", "defusedxml", + "s3fs", "eccodes", "h5netcdf", "xarray-datatree", + "skyfield", "ephem", "pint-xarray", "astropy", "dask-image", "python-geotiepoints", "numba"] [project.scripts] satpy_retrieve_all_aux_data = "satpy.aux_download:retrieve_all_cmd" diff --git a/satpy/tests/reader_tests/modis_tests/test_modis_l1b.py b/satpy/tests/reader_tests/modis_tests/test_modis_l1b.py index d4998a67f9..47f5f92c8e 100644 --- a/satpy/tests/reader_tests/modis_tests/test_modis_l1b.py +++ b/satpy/tests/reader_tests/modis_tests/test_modis_l1b.py @@ -22,7 +22,7 @@ import dask import numpy as np import pytest -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy import Scene, available_readers from satpy.tests.utils import CustomScheduler, make_dataid diff --git a/satpy/tests/reader_tests/modis_tests/test_modis_l2.py b/satpy/tests/reader_tests/modis_tests/test_modis_l2.py index 8876decb59..a30bfc392d 100644 --- a/satpy/tests/reader_tests/modis_tests/test_modis_l2.py +++ b/satpy/tests/reader_tests/modis_tests/test_modis_l2.py @@ -23,7 +23,7 @@ import dask.array as da import numpy as np import pytest -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy import Scene, available_readers from satpy.tests.utils import CustomScheduler, make_dataid diff --git a/satpy/tests/reader_tests/modis_tests/test_modis_l3.py b/satpy/tests/reader_tests/modis_tests/test_modis_l3.py index de8ff682a1..ca6c5e353a 100644 --- a/satpy/tests/reader_tests/modis_tests/test_modis_l3.py +++ b/satpy/tests/reader_tests/modis_tests/test_modis_l3.py @@ -23,7 +23,7 @@ import numpy as np import pytest from pyresample import geometry -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy import Scene, available_readers diff --git a/satpy/tests/reader_tests/test_abi_l1b.py b/satpy/tests/reader_tests/test_abi_l1b.py index 969c497410..37fd1d74c9 100644 --- a/satpy/tests/reader_tests/test_abi_l1b.py +++ b/satpy/tests/reader_tests/test_abi_l1b.py @@ -29,7 +29,7 @@ import numpy.typing as npt import pytest import xarray as xr -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy import DataQuery from satpy.readers.abi_l1b import NC_ABI_L1B diff --git a/satpy/tests/reader_tests/test_fci_l1c_nc.py b/satpy/tests/reader_tests/test_fci_l1c_nc.py index 792de90462..4bdf71e6b3 100644 --- a/satpy/tests/reader_tests/test_fci_l1c_nc.py +++ b/satpy/tests/reader_tests/test_fci_l1c_nc.py @@ -28,7 +28,7 @@ import pytest import xarray as xr from netCDF4 import default_fillvals -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy.readers.fci_l1c_nc import FCIL1cNCFileHandler from satpy.tests.reader_tests.test_netcdf_utils import FakeNetCDF4FileHandler diff --git a/satpy/tests/reader_tests/test_goci2_l2_nc.py b/satpy/tests/reader_tests/test_goci2_l2_nc.py index da54e11848..59bddefc88 100644 --- a/satpy/tests/reader_tests/test_goci2_l2_nc.py +++ b/satpy/tests/reader_tests/test_goci2_l2_nc.py @@ -21,7 +21,7 @@ import numpy as np import pytest import xarray as xr -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy import Scene from satpy.tests.utils import RANDOM_GEN diff --git a/satpy/tests/reader_tests/test_seadas_l2.py b/satpy/tests/reader_tests/test_seadas_l2.py index d3037e6b55..8343abbef2 100644 --- a/satpy/tests/reader_tests/test_seadas_l2.py +++ b/satpy/tests/reader_tests/test_seadas_l2.py @@ -20,7 +20,7 @@ import numpy as np 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, available_readers diff --git a/satpy/tests/reader_tests/test_viirs_edr.py b/satpy/tests/reader_tests/test_viirs_edr.py index 6beb3c0cab..74bd4a9ae4 100644 --- a/satpy/tests/reader_tests/test_viirs_edr.py +++ b/satpy/tests/reader_tests/test_viirs_edr.py @@ -34,7 +34,7 @@ import xarray as xr from pyresample import SwathDefinition from pytest import TempPathFactory # noqa: PT013 -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy.tests.utils import RANDOM_GEN diff --git a/satpy/tests/test_modifiers.py b/satpy/tests/test_modifiers.py index 148ea6692f..e8a0b4e539 100644 --- a/satpy/tests/test_modifiers.py +++ b/satpy/tests/test_modifiers.py @@ -25,7 +25,7 @@ import pytest import xarray as xr from pyresample.geometry import AreaDefinition, StackedAreaDefinition -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy.tests.utils import RANDOM_GEN diff --git a/satpy/tests/test_readers.py b/satpy/tests/test_readers.py index 4b477c6bdf..5e05f595b1 100644 --- a/satpy/tests/test_readers.py +++ b/satpy/tests/test_readers.py @@ -30,7 +30,7 @@ import numpy as np import pytest import xarray as xr -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from satpy.dataset.data_dict import get_key from satpy.dataset.dataid import DataID, ModifierTuple, WavelengthRange