Skip to content

Commit

Permalink
rf: import cfgman in conftest.py
Browse files Browse the repository at this point in the history
  • Loading branch information
christian-monch committed Dec 17, 2024
1 parent ab67fac commit 6a70a1a
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
3 changes: 1 addition & 2 deletions datalad_remake/annexremotes/tests/test_hierarchies.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion datalad_remake/annexremotes/tests/test_priority.py
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
1 change: 0 additions & 1 deletion datalad_remake/annexremotes/tests/test_remake_remote.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion datalad_remake/commands/tests/test_collection.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion datalad_remake/commands/tests/test_make.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion datalad_remake/commands/tests/test_provision.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion datalad_remake/tests/test_complex_cases.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
1 change: 0 additions & 1 deletion datalad_remake/utils/tests/test_verification.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 6a70a1a

Please sign in to comment.