Merge pull request #1133 from selfisekai/pytest_plugins

olzhasar-reef · web-flow · commit 7511b0bf80ee · 2026-03-04T00:13:16.000+05:00
Move pytest_plugins to top-level conftest
diff --git a/changelog.d/+pytest-9.0.infrastructure.md b/changelog.d/+pytest-9.0.infrastructure.md
@@ -0,0 +1 @@
+Fix tests with pytest 9.0.
diff --git a/pyproject.toml b/pyproject.toml
@@ -63,6 +63,7 @@ format = [
 lint = [
     "ruff~=0.8.4",
     "pytest==8.3.3",
+    "tenacity>=8.2.3,<9",
     "liccheck>=0.9.2",
     "setuptools>=60,<80",  # required by liccheck
 ]
diff --git a/test/conftest.py b/test/conftest.py
@@ -12,6 +12,8 @@
 
 import pytest
 
+pytest_plugins = ['b2sdk.v3.testing']
+
 
 @pytest.hookimpl
 def pytest_configure(config):
diff --git a/test/integration/conftest.py b/test/integration/conftest.py
@@ -47,9 +47,6 @@
 GENERAL_BUCKET_NAME_PREFIX = 'clitst'
 
 
-pytest_plugins = ['b2sdk.v3.testing']
-
-
 @pytest.fixture(scope='session', autouse=True)
 def summary_notes(request, worker_id):
     capmanager = request.config.pluginmanager.getplugin('capturemanager')
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ format = [`
`63`	`63`	`lint = [`
`64`	`64`	`"ruff~=0.8.4",`
`65`	`65`	`"pytest==8.3.3",`
	`66`	`+ "tenacity>=8.2.3,<9",`
`66`	`67`	`"liccheck>=0.9.2",`
`67`	`68`	`"setuptools>=60,<80", # required by liccheck`
`68`	`69`	`]`