From 6a70a1a8e883418b187c82b64b8ab98c15b064ef Mon Sep 17 00:00:00 2001 From: Christian Monch Date: Tue, 17 Dec 2024 12:22:56 +0100 Subject: [PATCH] rf: import `cfgman` in `conftest.py` --- conftest.py | 2 +- datalad_remake/annexremotes/tests/test_hierarchies.py | 3 +-- datalad_remake/annexremotes/tests/test_priority.py | 1 - datalad_remake/annexremotes/tests/test_remake_remote.py | 1 - datalad_remake/commands/tests/test_collection.py | 1 - datalad_remake/commands/tests/test_make.py | 1 - datalad_remake/commands/tests/test_provision.py | 1 - datalad_remake/tests/test_complex_cases.py | 1 - datalad_remake/utils/tests/test_verification.py | 1 - 9 files changed, 2 insertions(+), 10 deletions(-) diff --git a/conftest.py b/conftest.py index d86d75c..49c6288 100644 --- a/conftest.py +++ b/conftest.py @@ -3,6 +3,6 @@ # its tooling from datalad_next.conftest import setup_package -pytest_plugins = 'datalad_next.tests.fixtures' +pytest_plugins = ('datalad_core.tests.fixtures', 'datalad_next.tests.fixtures') __all__ = ['setup_package'] diff --git a/datalad_remake/annexremotes/tests/test_hierarchies.py b/datalad_remake/annexremotes/tests/test_hierarchies.py index 684be80..c9390f5 100644 --- a/datalad_remake/annexremotes/tests/test_hierarchies.py +++ b/datalad_remake/annexremotes/tests/test_hierarchies.py @@ -2,9 +2,8 @@ from pathlib import Path import pytest -from datalad_core.config import ConfigItem -from datalad_core.tests.fixtures import cfgman # noqa: F401 from datalad.distribution.get import Get as datalad_Get +from datalad_core.config import ConfigItem from datalad_next.datasets import Dataset from datalad_next.tests import skip_if_on_windows diff --git a/datalad_remake/annexremotes/tests/test_priority.py b/datalad_remake/annexremotes/tests/test_priority.py index 62ee343..2f4456e 100644 --- a/datalad_remake/annexremotes/tests/test_priority.py +++ b/datalad_remake/annexremotes/tests/test_priority.py @@ -1,7 +1,6 @@ import pytest from annexremote import Master from datalad_core.config import ConfigItem -from datalad_core.tests.fixtures import cfgman # noqa: F401 from datalad_next.tests import skip_if_on_windows from datalad_remake import ( diff --git a/datalad_remake/annexremotes/tests/test_remake_remote.py b/datalad_remake/annexremotes/tests/test_remake_remote.py index 1c3409b..ee9bcdc 100644 --- a/datalad_remake/annexremotes/tests/test_remake_remote.py +++ b/datalad_remake/annexremotes/tests/test_remake_remote.py @@ -1,6 +1,5 @@ import pytest from datalad_core.config import ConfigItem -from datalad_core.tests.fixtures import cfgman # noqa: F401 from datalad_next.tests import skip_if_on_windows from datalad_remake import allow_untrusted_execution_key diff --git a/datalad_remake/commands/tests/test_collection.py b/datalad_remake/commands/tests/test_collection.py index a1f71cd..53c16ca 100644 --- a/datalad_remake/commands/tests/test_collection.py +++ b/datalad_remake/commands/tests/test_collection.py @@ -1,6 +1,5 @@ from pathlib import Path -from datalad_core.tests.fixtures import cfgman # noqa: F401 from datalad_next.tests import skip_if_on_windows from ..make_cmd import collect diff --git a/datalad_remake/commands/tests/test_make.py b/datalad_remake/commands/tests/test_make.py index 035bd41..f0987c0 100644 --- a/datalad_remake/commands/tests/test_make.py +++ b/datalad_remake/commands/tests/test_make.py @@ -2,7 +2,6 @@ from urllib.parse import urlparse from datalad_core.config import ConfigItem -from datalad_core.tests.fixtures import cfgman from datalad_next.datasets import Dataset from datalad_next.tests import skip_if_on_windows diff --git a/datalad_remake/commands/tests/test_provision.py b/datalad_remake/commands/tests/test_provision.py index 0212209..9fc4480 100644 --- a/datalad_remake/commands/tests/test_provision.py +++ b/datalad_remake/commands/tests/test_provision.py @@ -4,7 +4,6 @@ from typing import TYPE_CHECKING from datalad.core.distributed.clone import Clone -from datalad_core.tests.fixtures import cfgman # noqa: F401 from datalad_next.datasets import Dataset from datalad_next.runners import call_git_lines from datalad_next.tests import skip_if_on_windows diff --git a/datalad_remake/tests/test_complex_cases.py b/datalad_remake/tests/test_complex_cases.py index 1d4650e..3236df3 100644 --- a/datalad_remake/tests/test_complex_cases.py +++ b/datalad_remake/tests/test_complex_cases.py @@ -1,7 +1,6 @@ from pathlib import Path from datalad_core.config import ConfigItem -from datalad_core.tests.fixtures import cfgman from datalad_remake import ( allow_untrusted_execution_key, diff --git a/datalad_remake/utils/tests/test_verification.py b/datalad_remake/utils/tests/test_verification.py index 946b998..08e9743 100644 --- a/datalad_remake/utils/tests/test_verification.py +++ b/datalad_remake/utils/tests/test_verification.py @@ -1,7 +1,6 @@ from pathlib import Path import pytest -from datalad_core.tests.fixtures import cfgman # noqa: F401 from datalad_remake.annexremotes.tests.test_remake_remote import create_keypair from datalad_remake.commands.tests.create_datasets import create_ds_hierarchy