Skip to content

Commit

Permalink
Merge pull request #694 from djhoese/test-replace-lazyfixture
Browse files Browse the repository at this point in the history
Replace deprecate pytest-lazy-fixture with pytest-lazy-fixtures
  • Loading branch information
djhoese committed May 17, 2024
2 parents 136e98c + 19c2ba5 commit a074dff
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions continuous_integration/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ dependencies:
- scipy
- zarr
- xarray
- pytest <8.0
- pytest
- pytest-cov
- pytest-lazy-fixture
- sphinx
- pip
- python-graphviz
Expand All @@ -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
2 changes: 1 addition & 1 deletion jenkins_environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion polar2grid/tests/test_filters/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion polar2grid/tests/test_glue.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion polar2grid/tests/test_resample/test_resample_scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a074dff

Please sign in to comment.