Skip to content

Commit

Permalink
Switch to pytest-lazy-fixtures (#756)
Browse files Browse the repository at this point in the history
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: #756
  • Loading branch information
gigony committed Aug 20, 2024
1 parent 79228c6 commit ef99071
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
7 changes: 4 additions & 3 deletions LICENSE-3rdparty.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions python/cucim/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions python/cucim/tests/fixtures/testimage.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down

0 comments on commit ef99071

Please sign in to comment.