Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to pytest-lazy-fixtures #756

Merged
merged 1 commit into from
Aug 20, 2024
+17 −16
Merged

Switch to pytest-lazy-fixtures #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions 3rdparty/LICENSE.pytest-lazy-fixture → 3rdparty/LICENSE.pytest-lazy-fixtures
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)
MIT License
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given pytest-lazy-fixtures bundles the license file in the wheel and conda packages, do we need to bundle the license file here or could it be dropped?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jakirkham !

All files under '3rdparty' folder is actually optional and we added the folder for tracking licenses internally.

Since 'LICENSE-3rdparty.md' file on the root folder covers the list of 3rdparty libraries, do you think it is better to remove whole '3rdparty' folder instead of maintaining the folder?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good idea. Let's follow up after we finish the devendoring work: #753

Since some of those dependencies are statically linked now, we do need to include their licenses. Though it is possible after devendoring that we can substantially reduce or drop licenses from this list

With Python only dependencies, we could clean those up before devendoring, but it might make sense to wait until we can do a more thorough cleanup


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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice to see that this can continue to be used as-is without further changes to the test cases using the fixture


from ..util.gen_image import ImageGenerator

Expand Down