From 46b7a06fa9cf24a5d44bcd090d6b64060ae89960 Mon Sep 17 00:00:00 2001 From: Antonio Valentino Date: Fri, 17 May 2024 07:51:20 +0200 Subject: [PATCH 1/2] Switch to pytest-lazy-fixtures --- pycoast/tests/test_pycoast.py | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pycoast/tests/test_pycoast.py b/pycoast/tests/test_pycoast.py index 4d144bc..b3a5eff 100644 --- a/pycoast/tests/test_pycoast.py +++ b/pycoast/tests/test_pycoast.py @@ -30,7 +30,7 @@ from PIL import Image, ImageFont from pyproj import CRS from pyresample.geometry import AreaDefinition -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture LOCAL_DIR = os.path.dirname(__file__) diff --git a/setup.py b/setup.py index bbe2b1c..accde10 100644 --- a/setup.py +++ b/setup.py @@ -27,11 +27,11 @@ "sphinx", "pyresample", "pytest", - "pytest-lazy-fixture", + "pytest-lazy-fixtures", "sphinx_rtd_theme", "sphinxcontrib-apidoc", ], - "tests": ["pyresample", "pytest", "pytest-cov", "coverage", "coveralls", "pytest-lazy-fixture"], + "tests": ["pyresample", "pytest", "pytest-cov", "coverage", "coveralls", "pytest-lazy-fixtures"], } with open("README", "r") as readme_file: From 051886ad1fc47923aa56a8435aa7ff8822136a3a Mon Sep 17 00:00:00 2001 From: Antonio Valentino Date: Fri, 17 May 2024 07:59:31 +0200 Subject: [PATCH 2/2] Install pytest-lazy-fixtures for testing --- .github/workflows/ci.yaml | 1 + continuous_integration/environment.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 745e5ff..24e503b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -49,6 +49,7 @@ jobs: - name: Install pycoast shell: bash -l {0} run: | + python -m pip install pytest-lazy-fixtures python -m pip install --no-deps -e . - name: Run unit tests diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml index edd2ceb..1f57a9b 100644 --- a/continuous_integration/environment.yaml +++ b/continuous_integration/environment.yaml @@ -12,4 +12,3 @@ dependencies: - pyresample - pytest <8.0 - pytest-cov - - pytest-lazy-fixture