Skip to content

Commit cdfb4ff

Browse files
committed
Change to public exposed pytest types
1 parent b234f89 commit cdfb4ff

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

nuts/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Provide necessary information that is needed for a specific test."""
22
import pathlib
33
from typing import Any, Callable, Optional, Dict
4-
from _pytest.config import Config
4+
from pytest import Config
55

66
from nornir import InitNornir
77
from nornir.core import Nornir

nuts/plugin.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
from pathlib import Path
44

55
import pytest
6-
from _pytest.config.argparsing import Parser
7-
from _pytest.main import Session
8-
from _pytest.nodes import Collector
9-
from _pytest.python import Metafunc
10-
from _pytest.fixtures import FixtureRequest
11-
from _pytest.config import Config
6+
from pytest import Parser
7+
from pytest import Session
8+
from pytest import Collector
9+
from pytest import Metafunc
10+
from pytest import FixtureRequest
11+
from pytest import Config
1212

1313
from nuts.context import NutsContext
1414
from nuts.context import NornirNutsContext

nuts/yamlloader.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
from importlib import util
77
from typing import Iterable, Union, Any, Optional, List, Set, Dict, Tuple
88

9-
import pytest
109
import yaml
10+
import pytest
11+
from pytest import Item, Collector
12+
from pytest import Metafunc
1113
from _pytest.mark import ParameterSet
1214
from _pytest.nodes import Node
13-
from _pytest.nodes import Item, Collector
14-
from _pytest.python import Metafunc
1515

1616
# from pytest import Metafunc, Item, Collector
1717

tests/base_tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import yaml
44
import pytest
5-
from _pytest.fixtures import FixtureRequest
5+
from pytest import FixtureRequest
66
from napalm.base.exceptions import ConnectionException
77
from nornir.core.task import AggregatedResult
88

0 commit comments

Comments
 (0)