Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move pytest_plugins to top-level conftest (fix for newer pytest).
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ format = [
lint = [
"ruff~=0.8.4",
"pytest>=8.3.3",
"tenacity>=9.1.2",
"liccheck==0.9.2",
"setuptools",
]
Expand Down
2 changes: 2 additions & 0 deletions test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

import pytest

pytest_plugins = ['b2sdk.v3.testing']


@pytest.fixture
def bg_executor():
Expand Down
12 changes: 0 additions & 12 deletions test/integration/conftest.py

This file was deleted.