From ef99071f6c39e0a23e5cbd004e73af34d6377fda Mon Sep 17 00:00:00 2001 From: Gigon Bae Date: Tue, 20 Aug 2024 13:37:04 -0700 Subject: [PATCH] Switch to pytest-lazy-fixtures (#756) Remove the `pytest-lazy-fixture` plugin and use the replacement `pytest-lazy-fixtures` package instead. Address #755 Authors: - Gigon Bae (https://github.com/gigony) Approvers: - https://github.com/jakirkham URL: https://github.com/rapidsai/cucim/pull/756 --- ...est-lazy-fixture => LICENSE.pytest-lazy-fixtures} | 12 ++++++------ LICENSE-3rdparty.md | 7 ++++--- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- python/cucim/pyproject.toml | 4 ++-- python/cucim/tests/fixtures/testimage.py | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) rename 3rdparty/{LICENSE.pytest-lazy-fixture => LICENSE.pytest-lazy-fixtures} (86%) diff --git a/3rdparty/LICENSE.pytest-lazy-fixture b/3rdparty/LICENSE.pytest-lazy-fixtures similarity index 86% rename from 3rdparty/LICENSE.pytest-lazy-fixture rename to 3rdparty/LICENSE.pytest-lazy-fixtures index 6c128cff6..f2c87d0e5 100644 --- a/3rdparty/LICENSE.pytest-lazy-fixture +++ b/3rdparty/LICENSE.pytest-lazy-fixtures @@ -1,6 +1,6 @@ -The MIT License (MIT) +MIT License -Copyright (c) 2016 Marsel Zaripov +Copyright (c) 2023 Anton Petrov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/LICENSE-3rdparty.md b/LICENSE-3rdparty.md index 984d0e952..a2e46342c 100644 --- a/LICENSE-3rdparty.md +++ b/LICENSE-3rdparty.md @@ -243,10 +243,11 @@ libcuckoo - Copyright: Carnegie Mellon University and Intel Corporation - Usage: Using concurrent hash table implementation for cache mechanism. -pytest-lazy-fixture +pytest-lazy-fixtures - License: MIT License - - https://github.com/TvoroG/pytest-lazy-fixture/blob/master/LICENSE -- Copyright: Marsel Zaripov +- https://github.com/dev-petrov/pytest-lazy-fixtures + - https://github.com/dev-petrov/pytest-lazy-fixtures/blob/master/LICENSE +- Copyright: Anton Petrov - Usage: Using lazy fixture feature in PyTest. psutil diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 9e0bbb497..161a787af 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -37,7 +37,7 @@ dependencies: - psutil>=5.8.0 - pydata-sphinx-theme - pytest-cov>=2.12.1 -- pytest-lazy-fixture>=0.6.3 +- pytest-lazy-fixtures>=1.0.0 - pytest-xdist - pytest>=6.2.4,<8.0.0a0 - python>=3.8,<3.12 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index d183e447d..65e94df9e 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -36,7 +36,7 @@ dependencies: - psutil>=5.8.0 - pydata-sphinx-theme - pytest-cov>=2.12.1 -- pytest-lazy-fixture>=0.6.3 +- pytest-lazy-fixtures>=1.0.0 - pytest-xdist - pytest>=6.2.4,<8.0.0a0 - python>=3.8,<3.12 diff --git a/dependencies.yaml b/dependencies.yaml index 30c66fb85..701aa5f77 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -303,7 +303,7 @@ dependencies: - psutil>=5.8.0 - pytest>=6.2.4,<8.0.0a0 - pytest-cov>=2.12.1 - - pytest-lazy-fixture>=0.6.3 + - pytest-lazy-fixtures>=1.0.0 - pytest-xdist - tifffile>=2022.7.28 - pooch>=1.6.0 # needed to download scikit-image sample data diff --git a/python/cucim/pyproject.toml b/python/cucim/pyproject.toml index 806419559..2df37c5a7 100644 --- a/python/cucim/pyproject.toml +++ b/python/cucim/pyproject.toml @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved. # See file LICENSE for terms. [build-system] @@ -66,7 +66,7 @@ test = [ "pooch>=1.6.0", "psutil>=5.8.0", "pytest-cov>=2.12.1", - "pytest-lazy-fixture>=0.6.3", + "pytest-lazy-fixtures>=1.0.0", "pytest-xdist", "pytest>=6.2.4,<8.0.0a0", "pywavelets>=1.0", diff --git a/python/cucim/tests/fixtures/testimage.py b/python/cucim/tests/fixtures/testimage.py index a4a9b9583..f9ef6a7d4 100644 --- a/python/cucim/tests/fixtures/testimage.py +++ b/python/cucim/tests/fixtures/testimage.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2021, NVIDIA CORPORATION. +# Copyright (c) 2021-2024, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -16,7 +16,7 @@ import shutil import pytest -from pytest_lazyfixture import lazy_fixture +from pytest_lazy_fixtures import lf as lazy_fixture from ..util.gen_image import ImageGenerator