Fix import orders

pytest_container/build.py

@@ -18,7 +18,6 @@
 
 from _pytest.config import Config
 from _pytest.mark.structures import ParameterSet
-
 from pytest_container.container import Container
 from pytest_container.container import container_from_pytest_param
 from pytest_container.container import DerivedContainer

pytest_container/container.py

@@ -43,7 +43,6 @@
 from _pytest.mark.structures import MarkDecorator
 from _pytest.mark.structures import ParameterSet
 from filelock import FileLock
-
 from pytest_container.inspect import ContainerHealth
 from pytest_container.inspect import ContainerInspect
 from pytest_container.inspect import PortForwarding

pytest_container/helpers.py

@@ -9,7 +9,6 @@
 from _pytest.config import Config
 from _pytest.config.argparsing import Parser
 from _pytest.python import Metafunc
-
 from pytest_container.logging import set_internal_logging_level
 
 

pytest_container/pod.py

@@ -13,7 +13,6 @@
 
 from _pytest.mark import ParameterSet
 from filelock import FileLock
-
 from pytest_container.container import Container
 from pytest_container.container import ContainerData
 from pytest_container.container import ContainerLauncher

pytest_container/runtime.py

@@ -22,7 +22,6 @@
 import pytest
 import testinfra
 from _pytest.mark.structures import ParameterSet
-
 from pytest_container.inspect import BindMount
 from pytest_container.inspect import Config
 from pytest_container.inspect import ContainerHealth

tests/test_container.py

@@ -4,12 +4,12 @@
 from typing import Union
 
 import pytest
-
-from . import images
 from pytest_container import Container
 from pytest_container import DerivedContainer
 from pytest_container.container import ImageFormat
 
+from . import images
+
 
 def test_derived_container_fails_without_base() -> None:
     """Ensure that a DerivedContainer cannot be instantiated without providing

tests/test_container_build.py

@@ -3,12 +3,6 @@
 
 import pytest
 from pytest import Config
-
-from .images import LEAP
-from .images import LEAP_URL
-from .images import LEAP_WITH_MAN
-from .images import LEAP_WITH_MAN_AND_LUA
-from .images import OPENSUSE_BUSYBOX_URL
 from pytest_container import Container
 from pytest_container import DerivedContainer
 from pytest_container import get_extra_build_args
@@ -19,6 +13,12 @@
 from pytest_container.runtime import LOCALHOST
 from pytest_container.runtime import OciRuntimeBase
 
+from .images import LEAP
+from .images import LEAP_URL
+from .images import LEAP_WITH_MAN
+from .images import LEAP_WITH_MAN_AND_LUA
+from .images import OPENSUSE_BUSYBOX_URL
+
 TAG1 = "local/foobar/bazbarf"
 
 

tests/test_copy_from_repo.py

@@ -1,10 +1,10 @@
 # pylint: disable=missing-function-docstring,missing-module-docstring
 from pytest import Config
-
-from .images import LEAP_URL
 from pytest_container import DerivedContainer
 from pytest_container.container import ContainerData
 
+from .images import LEAP_URL
+
 
 LEAP_WITH_CONFIG_FILE = DerivedContainer(
     base=LEAP_URL,

tests/test_env_variables.py

@@ -1,8 +1,9 @@
 # pylint: disable=missing-function-docstring,missing-module-docstring
-from .images import LEAP_URL
 from pytest_container.container import Container
 from pytest_container.container import ContainerData
 
+from .images import LEAP_URL
+
 ENV = {"SOMETHING": "42", "ANOTHER": "value", "dist": "/bin/dist"}
 LEAP_WITH_ENV = Container(
     url=LEAP_URL,

tests/test_healthcheck.py

@@ -4,9 +4,6 @@
 from typing import Optional
 
 import pytest
-
-from .images import LEAP
-from .images import LEAP_URL
 from pytest_container.container import ContainerData
 from pytest_container.container import DerivedContainer
 from pytest_container.container import ImageFormat
@@ -15,6 +12,9 @@
 from pytest_container.runtime import HealthCheck
 from pytest_container.runtime import OciRuntimeBase
 
+from .images import LEAP
+from .images import LEAP_URL
+
 
 CONTAINER_WITH_HEALTHCHECK = DerivedContainer(
     base=LEAP_URL,

tests/test_inspect.py

@@ -1,12 +1,12 @@
 # pylint: disable=missing-function-docstring,missing-module-docstring
 import pytest
-
-from .test_container_build import LEAP
 from pytest_container import DerivedContainer
 from pytest_container.container import ContainerData
 from pytest_container.inspect import VolumeMount
 from pytest_container.runtime import OciRuntimeBase
 
+from .test_container_build import LEAP
+
 
 IMAGE_WITH_EVERYTHING = DerivedContainer(
     base=LEAP,

tests/test_launcher.py

@@ -7,13 +7,6 @@
 from typing import Any
 
 import pytest
-
-from .images import CMDLINE_APP_CONTAINER
-from .images import CONTAINER_THAT_FAILS_TO_LAUNCH
-from .images import LEAP
-from .test_volumes import LEAP_WITH_BIND_MOUNT_AND_VOLUME
-from .test_volumes import LEAP_WITH_CONTAINER_VOLUMES
-from .test_volumes import LEAP_WITH_VOLUMES
 from pytest_container import inspect
 from pytest_container.container import BindMount
 from pytest_container.container import Container
@@ -25,6 +18,13 @@
 from pytest_container.runtime import LOCALHOST
 from pytest_container.runtime import OciRuntimeBase
 
+from .images import CMDLINE_APP_CONTAINER
+from .images import CONTAINER_THAT_FAILS_TO_LAUNCH
+from .images import LEAP
+from .test_volumes import LEAP_WITH_BIND_MOUNT_AND_VOLUME
+from .test_volumes import LEAP_WITH_CONTAINER_VOLUMES
+from .test_volumes import LEAP_WITH_VOLUMES
+
 
 LEAP_WITH_STOPSIGNAL_SIGKILL = DerivedContainer(
     base=LEAP,

tests/test_lock.py

@@ -4,13 +4,13 @@
 
 from _pytest.config import Config
 from filelock import FileLock
-
-from .images import LEAP_URL
-from .images import OPENSUSE_BUSYBOX_URL
 from pytest_container import Container
 from pytest_container import DerivedContainer
 from pytest_container.container import ContainerData
 
+from .images import LEAP_URL
+from .images import OPENSUSE_BUSYBOX_URL
+
 LEAP_WITH_LOCK = DerivedContainer(
     base=OPENSUSE_BUSYBOX_URL,
     custom_entry_point="/bin/sh",

tests/test_pod.py

@@ -2,14 +2,6 @@
 from pathlib import Path
 
 import pytest
-
-from .images import BUSYBOX
-from .images import CONTAINER_THAT_FAILS_TO_LAUNCH
-from .images import LEAP
-from .images import LEAP_WITH_MAN
-from .images import NGINX_URL
-from .images import TEST_POD
-from .images import WEB_SERVER
 from pytest_container.container import DerivedContainer
 from pytest_container.container import ImageFormat
 from pytest_container.container import PortForwarding
@@ -19,6 +11,14 @@
 from pytest_container.runtime import OciRuntimeBase
 from pytest_container.runtime import PodmanRuntime
 
+from .images import BUSYBOX
+from .images import CONTAINER_THAT_FAILS_TO_LAUNCH
+from .images import LEAP
+from .images import LEAP_WITH_MAN
+from .images import NGINX_URL
+from .images import TEST_POD
+from .images import WEB_SERVER
+
 
 TEST_POD_WITHOUT_PORTS = Pod(containers=[LEAP, LEAP_WITH_MAN, BUSYBOX])
 

tests/test_port_forwarding.py

@@ -4,16 +4,16 @@
 from typing import List
 
 import pytest
-
-from .images import NGINX_URL
-from .images import WEB_SERVER
 from pytest_container.container import ContainerData
 from pytest_container.container import DerivedContainer
 from pytest_container.container import PortForwarding
 from pytest_container.inspect import NetworkProtocol
 from pytest_container.runtime import LOCALHOST
 from pytest_container.runtime import Version
 
+from .images import NGINX_URL
+from .images import WEB_SERVER
+
 
 def _create_nginx_container(number: int) -> DerivedContainer:
     """Creates a nginx based container which serves

tests/test_pytest_param.py

@@ -4,9 +4,6 @@
 
 import pytest
 from _pytest.mark import ParameterSet
-
-from .images import LEAP
-from .images import TEST_POD
 from pytest_container import container_from_pytest_param
 from pytest_container import container_to_pytest_param
 from pytest_container import DerivedContainer
@@ -17,6 +14,9 @@
 from pytest_container.pod import Pod
 from pytest_container.pod import pod_from_pytest_param
 
+from .images import LEAP
+from .images import TEST_POD
+
 
 LEAP_PARAM = pytest.param(LEAP)
 LEAP_PARAM_2 = pytest.param(

tests/test_runtime.py

@@ -4,7 +4,6 @@
 from unittest.mock import patch
 
 import pytest
-
 from pytest_container.runtime import DockerRuntime
 from pytest_container.runtime import get_selected_runtime
 from pytest_container.runtime import OciRuntimeBase

tests/test_version.py

@@ -1,7 +1,6 @@
 """Unit tests of the Version class"""
 # pylint: disable=missing-function-docstring,missing-module-docstring
 import pytest
-
 from pytest_container import Version
 from pytest_container.runtime import _get_docker_version
 from pytest_container.runtime import _get_podman_version

tests/test_volumes.py

@@ -5,8 +5,6 @@
 from typing import List
 
 import pytest
-
-from .images import LEAP_URL
 from pytest_container.container import BindMount
 from pytest_container.container import BindMountCreator
 from pytest_container.container import ContainerData
@@ -18,6 +16,8 @@
 from pytest_container.runtime import LOCALHOST
 from pytest_container.runtime import OciRuntimeBase
 
+from .images import LEAP_URL
+
 
 @pytest.mark.parametrize(
     "volume,expected_flag",