diff --git a/Makefile b/Makefile index 66b5899e7..4818345a3 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ pytest: .PHONY: black black: poetry run black --check ${NORNIR_DIRS} + poetry run isort --check ${NORNIR_DIRS} .PHONY: sphinx sphinx: diff --git a/docs/conf.py b/docs/conf.py index 44136626c..b788d0d67 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -21,10 +21,10 @@ import sys from typing import Dict -from nornir import __version__ - from sphinx.application import Sphinx +from nornir import __version__ + sys.path.insert(0, os.path.abspath("../")) diff --git a/docs/highlighter.py b/docs/highlighter.py index 4f28db3c4..5ece78a42 100644 --- a/docs/highlighter.py +++ b/docs/highlighter.py @@ -1,11 +1,9 @@ from IPython.core.magic import register_line_magic from IPython.display import HTML - from pygments import highlight from pygments.formatters import HtmlFormatter from pygments.lexers import get_lexer_for_filename - HTML_TEMPLATE = """ diff --git a/nornir/core/__init__.py b/nornir/core/__init__.py index c30334fbd..bbe833bea 100644 --- a/nornir/core/__init__.py +++ b/nornir/core/__init__.py @@ -1,6 +1,6 @@ import logging import logging.config -from typing import List, Optional, TYPE_CHECKING +from typing import TYPE_CHECKING, List, Optional from nornir.core.configuration import Config from nornir.core.inventory import Inventory diff --git a/nornir/core/configuration.py b/nornir/core/configuration.py index adf86d8a4..8a04c02fe 100644 --- a/nornir/core/configuration.py +++ b/nornir/core/configuration.py @@ -5,12 +5,12 @@ import sys import warnings from pathlib import Path -from typing import Any, Dict, Optional, Type, TYPE_CHECKING, List, TypeVar - -from nornir.core.exceptions import ConflictingConfigurationWarning +from typing import TYPE_CHECKING, Any, Dict, List, Optional, Type, TypeVar import ruamel.yaml +from nornir.core.exceptions import ConflictingConfigurationWarning + if TYPE_CHECKING: from nornir.core.deserializer.inventory import Inventory # noqa diff --git a/nornir/core/exceptions.py b/nornir/core/exceptions.py index 5388a61fb..a5616faf1 100644 --- a/nornir/core/exceptions.py +++ b/nornir/core/exceptions.py @@ -1,4 +1,4 @@ -from typing import Dict, TYPE_CHECKING +from typing import TYPE_CHECKING, Dict if TYPE_CHECKING: from nornir.core.connection import Connection diff --git a/nornir/core/inventory.py b/nornir/core/inventory.py index 958a25840..694c59157 100644 --- a/nornir/core/inventory.py +++ b/nornir/core/inventory.py @@ -2,26 +2,22 @@ Any, Callable, Dict, + ItemsView, + Iterator, + KeysView, List, Optional, Set, + TypeVar, Union, - KeysView, ValuesView, - ItemsView, - Iterator, - TypeVar, ) -from nornir.core.configuration import Config -from nornir.core.plugins.connections import ( - ConnectionPlugin, - ConnectionPluginRegister, -) -from nornir.core.exceptions import ConnectionAlreadyOpen, ConnectionNotOpen - from mypy_extensions import Arg, KwArg +from nornir.core.configuration import Config +from nornir.core.exceptions import ConnectionAlreadyOpen, ConnectionNotOpen +from nornir.core.plugins.connections import ConnectionPlugin, ConnectionPluginRegister HostOrGroup = TypeVar("HostOrGroup", "Host", "Group") diff --git a/nornir/core/plugins/connections.py b/nornir/core/plugins/connections.py index 82ad42b79..f2324bddd 100644 --- a/nornir/core/plugins/connections.py +++ b/nornir/core/plugins/connections.py @@ -1,9 +1,8 @@ -from typing import Any, Dict, Type, Optional, Protocol +from typing import Any, Dict, Optional, Protocol, Type from nornir.core.configuration import Config from nornir.core.plugins.register import PluginRegister - CONNECTIONS_PLUGIN_PATH = "nornir.plugins.connections" diff --git a/nornir/core/plugins/inventory.py b/nornir/core/plugins/inventory.py index 37b5e1b9c..417affe48 100644 --- a/nornir/core/plugins/inventory.py +++ b/nornir/core/plugins/inventory.py @@ -1,9 +1,8 @@ -from typing import Any, Type, Protocol +from typing import Any, Protocol, Type from nornir.core.inventory import Inventory, TransformFunction from nornir.core.plugins.register import PluginRegister - INVENTORY_PLUGIN_PATH = "nornir.plugins.inventory" TRANSFORM_FUNCTION_PLUGIN_PATH = "nornir.plugins.transform_function" diff --git a/nornir/core/plugins/register.py b/nornir/core/plugins/register.py index f28553d69..ef86e03b2 100644 --- a/nornir/core/plugins/register.py +++ b/nornir/core/plugins/register.py @@ -1,10 +1,7 @@ import sys -from typing import Dict, TypeVar, Generic +from typing import Dict, Generic, TypeVar -from nornir.core.exceptions import ( - PluginAlreadyRegistered, - PluginNotRegistered, -) +from nornir.core.exceptions import PluginAlreadyRegistered, PluginNotRegistered if sys.version_info >= (3, 10): from importlib import metadata diff --git a/nornir/core/plugins/runners.py b/nornir/core/plugins/runners.py index 1a92dc9e8..1f9dca079 100644 --- a/nornir/core/plugins/runners.py +++ b/nornir/core/plugins/runners.py @@ -1,9 +1,8 @@ -from typing import Any, List, Type, Protocol +from typing import Any, List, Protocol, Type -from nornir.core.task import AggregatedResult, Task from nornir.core.inventory import Host from nornir.core.plugins.register import PluginRegister - +from nornir.core.task import AggregatedResult, Task RUNNERS_PLUGIN_PATH = "nornir.plugins.runners" diff --git a/nornir/core/processor.py b/nornir/core/processor.py index 98bba7a1a..91867e0cf 100644 --- a/nornir/core/processor.py +++ b/nornir/core/processor.py @@ -1,5 +1,7 @@ from typing import List, Protocol +from typing_extensions import Protocol + from nornir.core.inventory import Host from nornir.core.task import AggregatedResult, MultiResult, Task diff --git a/nornir/core/state.py b/nornir/core/state.py index 48d079ec5..3c58f36bd 100644 --- a/nornir/core/state.py +++ b/nornir/core/state.py @@ -1,4 +1,4 @@ -from typing import Any, Dict, Set, Optional +from typing import Any, Dict, Optional, Set class GlobalState(object): diff --git a/nornir/core/task.py b/nornir/core/task.py index d063d8fb3..979fe5de2 100644 --- a/nornir/core/task.py +++ b/nornir/core/task.py @@ -1,9 +1,8 @@ import logging import traceback -from typing import Any, Callable, Dict, List, Optional, TYPE_CHECKING, Union, cast +from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Union, cast -from nornir.core.exceptions import NornirExecutionError -from nornir.core.exceptions import NornirSubTaskError +from nornir.core.exceptions import NornirExecutionError, NornirSubTaskError if TYPE_CHECKING: from nornir.core import Nornir diff --git a/nornir/init_nornir.py b/nornir/init_nornir.py index 6d4708d18..7de8f8a49 100644 --- a/nornir/init_nornir.py +++ b/nornir/init_nornir.py @@ -3,11 +3,11 @@ from nornir.core import Nornir from nornir.core.configuration import Config from nornir.core.inventory import Inventory +from nornir.core.plugins.connections import ConnectionPluginRegister from nornir.core.plugins.inventory import ( InventoryPluginRegister, TransformFunctionRegister, ) -from nornir.core.plugins.connections import ConnectionPluginRegister from nornir.core.plugins.runners import RunnerPlugin, RunnersPluginRegister from nornir.core.state import GlobalState diff --git a/nornir/plugins/inventory/simple.py b/nornir/plugins/inventory/simple.py index d453073e8..0ee0884ca 100644 --- a/nornir/plugins/inventory/simple.py +++ b/nornir/plugins/inventory/simple.py @@ -2,20 +2,20 @@ import pathlib from typing import Any, Dict, Type +import ruamel.yaml + from nornir.core.inventory import ( - Inventory, + ConnectionOptions, + Defaults, Group, Groups, Host, - Hosts, - Defaults, - ConnectionOptions, HostOrGroup, + Hosts, + Inventory, ParentGroups, ) -import ruamel.yaml - logger = logging.getLogger(__name__) diff --git a/nornir/plugins/runners/__init__.py b/nornir/plugins/runners/__init__.py index cb8229835..41d5cf78f 100644 --- a/nornir/plugins/runners/__init__.py +++ b/nornir/plugins/runners/__init__.py @@ -1,8 +1,8 @@ -from typing import List from concurrent.futures import ThreadPoolExecutor +from typing import List -from nornir.core.task import AggregatedResult, Task from nornir.core.inventory import Host +from nornir.core.task import AggregatedResult, Task class SerialRunner: diff --git a/poetry.lock b/poetry.lock index 4be70b8d0..1c7aca417 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,8 @@ +<<<<<<< HEAD # This file is automatically @generated by Poetry and should not be changed by hand. +======= +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. +>>>>>>> 8a4c37b (add isort to manage/sort imports) [[package]] name = "alabaster" @@ -984,6 +988,23 @@ files = [ [package.dependencies] arrow = ">=0.15.0" +[[package]] +name = "isort" +version = "5.12.0" +description = "A Python utility / library to sort Python imports." +optional = false +python-versions = ">=3.8.0" +files = [ + {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"}, + {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"}, +] + +[package.extras] +colors = ["colorama (>=0.4.3)"] +pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"] +plugins = ["setuptools"] +requirements-deprecated-finder = ["pip-api", "pipreqs"] + [[package]] name = "jedi" version = "0.19.0" @@ -1534,6 +1555,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -2562,6 +2593,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -2569,8 +2601,15 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -2587,6 +2626,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -2594,6 +2634,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -3668,4 +3709,8 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8,<4.0" +<<<<<<< HEAD content-hash = "f5cbd7f60247875e8c0a12f3e92464072bceec475e44f8569b158664cb2cbea6" +======= +content-hash = "b143011e3dd4c690f6d5fd4206c5a7c0d38721ab35f6a283a5c3b913647a3df7" +>>>>>>> 8a4c37b (add isort to manage/sort imports) diff --git a/pyproject.toml b/pyproject.toml index d5916eb6d..461342dcb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,6 +46,7 @@ types-pkg-resources = "^0.1.3" nornir-jinja2 = "0.2.0" nornir-utils = "0.2.0" nornir-napalm = "0.4.0" +isort = "^5.12.0" [tool.poetry.group.docs.dependencies] sphinx = "6.2.1" @@ -56,3 +57,5 @@ nbsphinx = "0.9.2" pygments = "2.16.1" sphinx-issues = "3.0.1" +[tool.isort] +profile = "black" \ No newline at end of file diff --git a/tests/__init__.py b/tests/__init__.py index ed6b6fa79..04099086c 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,5 @@ import os + import pytest skip = pytest.mark.skipif( diff --git a/tests/conftest.py b/tests/conftest.py index 89a4f064e..feab13c4b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,22 +1,22 @@ -from typing import List import os +from typing import List + +import pytest +import ruamel.yaml + from nornir.core import Nornir from nornir.core.inventory import ( - Inventory, - Host, - Hosts, + ConnectionOptions, + Defaults, Group, Groups, - Defaults, + Host, + Hosts, + Inventory, ParentGroups, - ConnectionOptions, ) -from nornir.core.task import AggregatedResult, Task from nornir.core.state import GlobalState - -import ruamel.yaml -import pytest - +from nornir.core.task import AggregatedResult, Task global_data = GlobalState(dry_run=True) diff --git a/tests/core/test_InitNornir.py b/tests/core/test_InitNornir.py index dce47dcd4..c926b634e 100644 --- a/tests/core/test_InitNornir.py +++ b/tests/core/test_InitNornir.py @@ -1,17 +1,17 @@ import logging import logging.config import os + import pytest from nornir import InitNornir from nornir.core.exceptions import ConflictingConfigurationWarning -from nornir.core.inventory import Inventory, Host, Hosts, Groups, Group, Defaults +from nornir.core.inventory import Defaults, Group, Groups, Host, Hosts, Inventory from nornir.core.plugins.inventory import ( InventoryPluginRegister, TransformFunctionRegister, ) - dir_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "test_InitNornir") LOGGING_DICT = { diff --git a/tests/core/test_configuration.py b/tests/core/test_configuration.py index 0cd6e996e..9726a912b 100644 --- a/tests/core/test_configuration.py +++ b/tests/core/test_configuration.py @@ -3,7 +3,6 @@ from nornir.core.configuration import Config - dir_path = os.path.join( os.path.dirname(os.path.realpath(__file__)), "test_configuration" ) diff --git a/tests/core/test_connections.py b/tests/core/test_connections.py index fb54e33d2..b18eb2acb 100644 --- a/tests/core/test_connections.py +++ b/tests/core/test_connections.py @@ -1,15 +1,15 @@ from typing import Any, Dict, Optional +import pytest + from nornir.core.configuration import Config -from nornir.core.plugins.connections import ConnectionPluginRegister from nornir.core.exceptions import ( ConnectionAlreadyOpen, ConnectionNotOpen, PluginAlreadyRegistered, PluginNotRegistered, ) - -import pytest +from nornir.core.plugins.connections import ConnectionPluginRegister class DummyConnectionPlugin: diff --git a/tests/core/test_filter.py b/tests/core/test_filter.py index 7599e3f67..276c56e45 100644 --- a/tests/core/test_filter.py +++ b/tests/core/test_filter.py @@ -1,5 +1,6 @@ import pytest -from nornir.core.filter import F, AND, OR + +from nornir.core.filter import AND, OR, F class Test(object): diff --git a/tests/core/test_inventory.py b/tests/core/test_inventory.py index 6a48a16b3..1d84cce4b 100644 --- a/tests/core/test_inventory.py +++ b/tests/core/test_inventory.py @@ -1,11 +1,9 @@ import os -from nornir.core import inventory - import pytest - import ruamel.yaml +from nornir.core import inventory yaml = ruamel.yaml.YAML(typ="safe") dir_path = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/core/test_registered_plugins.py b/tests/core/test_registered_plugins.py index a35f847cf..ab2996b63 100644 --- a/tests/core/test_registered_plugins.py +++ b/tests/core/test_registered_plugins.py @@ -1,11 +1,10 @@ +from nornir_utils.plugins.inventory import YAMLInventory + from nornir.core.plugins.inventory import InventoryPluginRegister from nornir.core.plugins.runners import RunnersPluginRegister - from nornir.plugins.inventory import SimpleInventory from nornir.plugins.runners import SerialRunner, ThreadedRunner -from nornir_utils.plugins.inventory import YAMLInventory - class Test: def test_registered_runners(self): diff --git a/tests/core/test_tasks.py b/tests/core/test_tasks.py index 0f44432b1..cbd61f699 100644 --- a/tests/core/test_tasks.py +++ b/tests/core/test_tasks.py @@ -1,7 +1,7 @@ import logging -from nornir.core.task import Result from nornir.core.exceptions import NornirSubTaskError +from nornir.core.task import Result class CustomException(Exception): diff --git a/tests/plugins/processors/test_threaded.py b/tests/plugins/processors/test_threaded.py index e4fdf8bbb..38c18498f 100644 --- a/tests/plugins/processors/test_threaded.py +++ b/tests/plugins/processors/test_threaded.py @@ -1,11 +1,10 @@ import datetime import time -from nornir.core.exceptions import NornirExecutionError -from nornir.plugins.runners import ThreadedRunner - import pytest +from nornir.core.exceptions import NornirExecutionError +from nornir.plugins.runners import ThreadedRunner NUM_WORKERS = 20