From d50cc429c2adc61c0af5275972bd740f846d55fe Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Wed, 3 Jan 2024 21:23:04 +0200 Subject: [PATCH] Enable Ruff I (import sort), autofix Signed-off-by: Aarni Koskela --- docker/__init__.py | 3 +- docker/api/build.py | 6 +--- docker/api/client.py | 22 +++++++++++---- docker/api/container.py | 15 +++++----- docker/api/exec_api.py | 3 +- docker/api/network.py | 5 ++-- docker/api/secret.py | 3 +- docker/api/swarm.py | 7 ++--- docker/api/volume.py | 3 +- docker/auth.py | 3 +- docker/client.py | 2 +- docker/constants.py | 1 + docker/context/__init__.py | 2 +- docker/context/api.py | 10 ++++--- docker/context/config.py | 7 ++--- docker/context/context.py | 15 ++++++---- docker/credentials/__init__.py | 4 +-- docker/credentials/store.py | 3 +- docker/models/configs.py | 2 +- docker/models/containers.py | 11 +++++--- docker/models/networks.py | 2 +- docker/models/nodes.py | 2 +- docker/models/secrets.py | 2 +- docker/models/services.py | 8 ++++-- docker/models/swarm.py | 1 + docker/models/volumes.py | 2 +- docker/transport/__init__.py | 1 + docker/transport/npipeconn.py | 7 +++-- docker/transport/npipesocket.py | 8 +++--- docker/transport/sshconn.py | 15 +++++----- docker/transport/unixconn.py | 8 +++--- docker/types/__init__.py | 27 ++++++++++++------ docker/types/containers.py | 14 ++++++++-- docker/types/services.py | 8 ++++-- docker/utils/__init__.py | 31 +++++++++++++++------ docker/utils/build.py | 3 +- docker/utils/json_stream.py | 1 - docker/utils/utils.py | 13 +++++---- docker/version.py | 2 +- docs/conf.py | 1 + pyproject.toml | 1 + setup.py | 3 +- tests/helpers.py | 3 +- tests/integration/api_build_test.py | 6 ++-- tests/integration/api_config_test.py | 3 +- tests/integration/api_container_test.py | 18 ++++++------ tests/integration/api_exec_test.py | 15 +++++----- tests/integration/api_healthcheck_test.py | 2 +- tests/integration/api_image_test.py | 7 ++--- tests/integration/api_network_test.py | 5 ++-- tests/integration/api_plugin_test.py | 5 ++-- tests/integration/api_secret_test.py | 3 +- tests/integration/api_service_test.py | 9 +++--- tests/integration/api_swarm_test.py | 4 ++- tests/integration/api_volume_test.py | 3 +- tests/integration/base.py | 3 +- tests/integration/client_test.py | 3 +- tests/integration/conftest.py | 3 +- tests/integration/context_api_test.py | 3 ++ tests/integration/credentials/store_test.py | 7 +++-- tests/integration/credentials/utils_test.py | 2 +- tests/integration/errors_test.py | 6 ++-- tests/integration/models_containers_test.py | 7 ++--- tests/integration/models_images_test.py | 5 ++-- tests/integration/models_networks_test.py | 3 +- tests/integration/models_resources_test.py | 3 +- tests/integration/models_services_test.py | 7 +++-- tests/integration/models_swarm_test.py | 3 +- tests/integration/models_volumes_test.py | 3 +- tests/integration/regression_test.py | 5 ++-- tests/ssh/api_build_test.py | 6 ++-- tests/ssh/base.py | 3 +- tests/ssh/connect_test.py | 4 ++- tests/unit/api_container_test.py | 15 ++++++---- tests/unit/api_exec_test.py | 5 +++- tests/unit/api_image_test.py | 15 ++++++---- tests/unit/api_network_test.py | 5 ++-- tests/unit/api_test.py | 10 +++---- tests/unit/api_volume_test.py | 2 +- tests/unit/auth_test.py | 5 ++-- tests/unit/client_test.py | 11 +++++--- tests/unit/context_test.py | 10 +++---- tests/unit/dockertypes_test.py | 13 +++++++-- tests/unit/errors_test.py | 11 ++++++-- tests/unit/fake_api_client.py | 3 +- tests/unit/models_configs_test.py | 3 +- tests/unit/models_containers_test.py | 6 ++-- tests/unit/models_networks_test.py | 2 +- tests/unit/models_secrets_test.py | 2 +- tests/unit/models_services_test.py | 1 + tests/unit/sshadapter_test.py | 1 + tests/unit/swarm_test.py | 4 +-- tests/unit/utils_build_test.py | 2 +- tests/unit/utils_config_test.py | 8 +++--- tests/unit/utils_json_stream_test.py | 2 +- tests/unit/utils_test.py | 22 +++++++++++---- 96 files changed, 364 insertions(+), 240 deletions(-) diff --git a/docker/__init__.py b/docker/__init__.py index c1c518c56..fb7a5e921 100644 --- a/docker/__init__.py +++ b/docker/__init__.py @@ -1,7 +1,6 @@ from .api import APIClient from .client import DockerClient, from_env -from .context import Context -from .context import ContextAPI +from .context import Context, ContextAPI from .tls import TLSConfig from .version import __version__ diff --git a/docker/api/build.py b/docker/api/build.py index abd5ab52a..47216a58f 100644 --- a/docker/api/build.py +++ b/docker/api/build.py @@ -3,11 +3,7 @@ import os import random -from .. import auth -from .. import constants -from .. import errors -from .. import utils - +from .. import auth, constants, errors, utils log = logging.getLogger(__name__) diff --git a/docker/api/client.py b/docker/api/client.py index 499a7c785..394ceb1f5 100644 --- a/docker/api/client.py +++ b/docker/api/client.py @@ -8,12 +8,22 @@ import requests.exceptions from .. import auth -from ..constants import (DEFAULT_NUM_POOLS, DEFAULT_NUM_POOLS_SSH, - DEFAULT_MAX_POOL_SIZE, DEFAULT_TIMEOUT_SECONDS, - DEFAULT_USER_AGENT, IS_WINDOWS_PLATFORM, - MINIMUM_DOCKER_API_VERSION, STREAM_HEADER_SIZE_BYTES) -from ..errors import (DockerException, InvalidVersion, TLSParameterError, - create_api_error_from_http_exception) +from ..constants import ( + DEFAULT_MAX_POOL_SIZE, + DEFAULT_NUM_POOLS, + DEFAULT_NUM_POOLS_SSH, + DEFAULT_TIMEOUT_SECONDS, + DEFAULT_USER_AGENT, + IS_WINDOWS_PLATFORM, + MINIMUM_DOCKER_API_VERSION, + STREAM_HEADER_SIZE_BYTES, +) +from ..errors import ( + DockerException, + InvalidVersion, + TLSParameterError, + create_api_error_from_http_exception, +) from ..tls import TLSConfig from ..transport import UnixHTTPAdapter from ..utils import check_resource, config, update_headers, utils diff --git a/docker/api/container.py b/docker/api/container.py index 5a267d13f..1f153eeb7 100644 --- a/docker/api/container.py +++ b/docker/api/container.py @@ -1,13 +1,14 @@ from datetime import datetime -from .. import errors -from .. import utils +from .. import errors, utils from ..constants import DEFAULT_DATA_CHUNK_SIZE -from ..types import CancellableStream -from ..types import ContainerConfig -from ..types import EndpointConfig -from ..types import HostConfig -from ..types import NetworkingConfig +from ..types import ( + CancellableStream, + ContainerConfig, + EndpointConfig, + HostConfig, + NetworkingConfig, +) class ContainerApiMixin: diff --git a/docker/api/exec_api.py b/docker/api/exec_api.py index 63df9e6c6..d8fc50dd3 100644 --- a/docker/api/exec_api.py +++ b/docker/api/exec_api.py @@ -1,5 +1,4 @@ -from .. import errors -from .. import utils +from .. import errors, utils from ..types import CancellableStream diff --git a/docker/api/network.py b/docker/api/network.py index dd4e3761a..2b1925710 100644 --- a/docker/api/network.py +++ b/docker/api/network.py @@ -1,7 +1,6 @@ -from ..errors import InvalidVersion -from ..utils import check_resource, minimum_version -from ..utils import version_lt from .. import utils +from ..errors import InvalidVersion +from ..utils import check_resource, minimum_version, version_lt class NetworkApiMixin: diff --git a/docker/api/secret.py b/docker/api/secret.py index cd440b95f..db1701bdc 100644 --- a/docker/api/secret.py +++ b/docker/api/secret.py @@ -1,7 +1,6 @@ import base64 -from .. import errors -from .. import utils +from .. import errors, utils class SecretApiMixin: diff --git a/docker/api/swarm.py b/docker/api/swarm.py index d09dd087b..d60d18b61 100644 --- a/docker/api/swarm.py +++ b/docker/api/swarm.py @@ -1,9 +1,8 @@ -import logging import http.client as http_client +import logging + +from .. import errors, types, utils from ..constants import DEFAULT_SWARM_ADDR_POOL, DEFAULT_SWARM_SUBNET_SIZE -from .. import errors -from .. import types -from .. import utils log = logging.getLogger(__name__) diff --git a/docker/api/volume.py b/docker/api/volume.py index 98b42a124..c6c036fad 100644 --- a/docker/api/volume.py +++ b/docker/api/volume.py @@ -1,5 +1,4 @@ -from .. import errors -from .. import utils +from .. import errors, utils class VolumeApiMixin: diff --git a/docker/auth.py b/docker/auth.py index 7a301ba40..96a6e3a65 100644 --- a/docker/auth.py +++ b/docker/auth.py @@ -2,8 +2,7 @@ import json import logging -from . import credentials -from . import errors +from . import credentials, errors from .utils import config INDEX_NAME = 'docker.io' diff --git a/docker/client.py b/docker/client.py index 2910c1259..9012d24c9 100644 --- a/docker/client.py +++ b/docker/client.py @@ -1,5 +1,5 @@ from .api.client import APIClient -from .constants import (DEFAULT_TIMEOUT_SECONDS, DEFAULT_MAX_POOL_SIZE) +from .constants import DEFAULT_MAX_POOL_SIZE, DEFAULT_TIMEOUT_SECONDS from .models.configs import ConfigCollection from .models.containers import ContainerCollection from .models.images import ImageCollection diff --git a/docker/constants.py b/docker/constants.py index 71e543e53..433e6c4e2 100644 --- a/docker/constants.py +++ b/docker/constants.py @@ -1,4 +1,5 @@ import sys + from .version import __version__ DEFAULT_DOCKER_API_VERSION = '1.43' diff --git a/docker/context/__init__.py b/docker/context/__init__.py index dbf172fda..46d462b0c 100644 --- a/docker/context/__init__.py +++ b/docker/context/__init__.py @@ -1,2 +1,2 @@ -from .context import Context from .api import ContextAPI +from .context import Context diff --git a/docker/context/api.py b/docker/context/api.py index 493f470e5..ae5d67bb2 100644 --- a/docker/context/api.py +++ b/docker/context/api.py @@ -2,11 +2,13 @@ import os from docker import errors -from docker.context.config import get_meta_dir -from docker.context.config import METAFILE -from docker.context.config import get_current_context_name -from docker.context.config import write_context_name_to_docker_config from docker.context import Context +from docker.context.config import ( + METAFILE, + get_current_context_name, + get_meta_dir, + write_context_name_to_docker_config, +) class ContextAPI: diff --git a/docker/context/config.py b/docker/context/config.py index 8c3fe2500..5a6373aa4 100644 --- a/docker/context/config.py +++ b/docker/context/config.py @@ -1,10 +1,9 @@ -import os -import json import hashlib +import json +import os from docker import utils -from docker.constants import IS_WINDOWS_PLATFORM -from docker.constants import DEFAULT_UNIX_SOCKET +from docker.constants import DEFAULT_UNIX_SOCKET, IS_WINDOWS_PLATFORM from docker.utils.config import find_config_file METAFILE = "meta.json" diff --git a/docker/context/context.py b/docker/context/context.py index 4faf8e701..317bcf61d 100644 --- a/docker/context/context.py +++ b/docker/context/context.py @@ -1,12 +1,15 @@ -import os import json +import os from shutil import copyfile, rmtree -from docker.tls import TLSConfig + +from docker.context.config import ( + get_context_host, + get_meta_dir, + get_meta_file, + get_tls_dir, +) from docker.errors import ContextException -from docker.context.config import get_meta_dir -from docker.context.config import get_meta_file -from docker.context.config import get_tls_dir -from docker.context.config import get_context_host +from docker.tls import TLSConfig class Context: diff --git a/docker/credentials/__init__.py b/docker/credentials/__init__.py index a1247700d..80d19e798 100644 --- a/docker/credentials/__init__.py +++ b/docker/credentials/__init__.py @@ -1,8 +1,8 @@ -from .store import Store -from .errors import StoreError, CredentialsNotFound from .constants import ( DEFAULT_LINUX_STORE, DEFAULT_OSX_STORE, DEFAULT_WIN32_STORE, PROGRAM_PREFIX, ) +from .errors import CredentialsNotFound, StoreError +from .store import Store diff --git a/docker/credentials/store.py b/docker/credentials/store.py index 4e63a5ba6..00d693a4b 100644 --- a/docker/credentials/store.py +++ b/docker/credentials/store.py @@ -4,8 +4,7 @@ import subprocess import warnings -from . import constants -from . import errors +from . import constants, errors from .utils import create_environment_dict diff --git a/docker/models/configs.py b/docker/models/configs.py index 5ef137784..4eba87f4e 100644 --- a/docker/models/configs.py +++ b/docker/models/configs.py @@ -1,5 +1,5 @@ from ..api import APIClient -from .resource import Model, Collection +from .resource import Collection, Model class Config(Model): diff --git a/docker/models/containers.py b/docker/models/containers.py index 32676bb85..35d8b3141 100644 --- a/docker/models/containers.py +++ b/docker/models/containers.py @@ -2,16 +2,19 @@ import ntpath from collections import namedtuple -from .images import Image -from .resource import Collection, Model from ..api import APIClient from ..constants import DEFAULT_DATA_CHUNK_SIZE from ..errors import ( - ContainerError, DockerException, ImageNotFound, - NotFound, create_unexpected_kwargs_error + ContainerError, + DockerException, + ImageNotFound, + NotFound, + create_unexpected_kwargs_error, ) from ..types import HostConfig, NetworkingConfig from ..utils import version_gte +from .images import Image +from .resource import Collection, Model class Container(Model): diff --git a/docker/models/networks.py b/docker/models/networks.py index f50287907..9b3ed7829 100644 --- a/docker/models/networks.py +++ b/docker/models/networks.py @@ -1,7 +1,7 @@ from ..api import APIClient from ..utils import version_gte from .containers import Container -from .resource import Model, Collection +from .resource import Collection, Model class Network(Model): diff --git a/docker/models/nodes.py b/docker/models/nodes.py index 8dd9350c0..2fa480c54 100644 --- a/docker/models/nodes.py +++ b/docker/models/nodes.py @@ -1,4 +1,4 @@ -from .resource import Model, Collection +from .resource import Collection, Model class Node(Model): diff --git a/docker/models/secrets.py b/docker/models/secrets.py index da01d44c8..38c48dc7e 100644 --- a/docker/models/secrets.py +++ b/docker/models/secrets.py @@ -1,5 +1,5 @@ from ..api import APIClient -from .resource import Model, Collection +from .resource import Collection, Model class Secret(Model): diff --git a/docker/models/services.py b/docker/models/services.py index 70037041a..09502633e 100644 --- a/docker/models/services.py +++ b/docker/models/services.py @@ -1,7 +1,9 @@ import copy -from docker.errors import create_unexpected_kwargs_error, InvalidArgument -from docker.types import TaskTemplate, ContainerSpec, Placement, ServiceMode -from .resource import Model, Collection + +from docker.errors import InvalidArgument, create_unexpected_kwargs_error +from docker.types import ContainerSpec, Placement, ServiceMode, TaskTemplate + +from .resource import Collection, Model class Service(Model): diff --git a/docker/models/swarm.py b/docker/models/swarm.py index 1e39f3fd2..271cc5dcb 100644 --- a/docker/models/swarm.py +++ b/docker/models/swarm.py @@ -1,5 +1,6 @@ from docker.api import APIClient from docker.errors import APIError + from .resource import Model diff --git a/docker/models/volumes.py b/docker/models/volumes.py index 3c2e83780..12c9f14b2 100644 --- a/docker/models/volumes.py +++ b/docker/models/volumes.py @@ -1,5 +1,5 @@ from ..api import APIClient -from .resource import Model, Collection +from .resource import Collection, Model class Volume(Model): diff --git a/docker/transport/__init__.py b/docker/transport/__init__.py index 07bc7fd58..8c68b1f6e 100644 --- a/docker/transport/__init__.py +++ b/docker/transport/__init__.py @@ -1,4 +1,5 @@ from .unixconn import UnixHTTPAdapter + try: from .npipeconn import NpipeHTTPAdapter from .npipesocket import NpipeSocket diff --git a/docker/transport/npipeconn.py b/docker/transport/npipeconn.py index d335d8718..fe740a5f8 100644 --- a/docker/transport/npipeconn.py +++ b/docker/transport/npipeconn.py @@ -1,13 +1,14 @@ import queue + import requests.adapters +import urllib3 +import urllib3.connection from docker.transport.basehttpadapter import BaseHTTPAdapter + from .. import constants from .npipesocket import NpipeSocket -import urllib3 -import urllib3.connection - RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer diff --git a/docker/transport/npipesocket.py b/docker/transport/npipesocket.py index 9cbe40cc7..d91938e76 100644 --- a/docker/transport/npipesocket.py +++ b/docker/transport/npipesocket.py @@ -1,12 +1,12 @@ import functools -import time import io +import time -import win32file -import win32pipe import pywintypes -import win32event import win32api +import win32event +import win32file +import win32pipe cERROR_PIPE_BUSY = 0xe7 cSECURITY_SQOS_PRESENT = 0x100000 diff --git a/docker/transport/sshconn.py b/docker/transport/sshconn.py index 6e1d0ee72..91671e920 100644 --- a/docker/transport/sshconn.py +++ b/docker/transport/sshconn.py @@ -1,19 +1,20 @@ -import paramiko -import queue -import urllib.parse -import requests.adapters import logging import os +import queue import signal import socket import subprocess +import urllib.parse -from docker.transport.basehttpadapter import BaseHTTPAdapter -from .. import constants - +import paramiko +import requests.adapters import urllib3 import urllib3.connection +from docker.transport.basehttpadapter import BaseHTTPAdapter + +from .. import constants + RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer diff --git a/docker/transport/unixconn.py b/docker/transport/unixconn.py index 09d373dd6..f88d29ebf 100644 --- a/docker/transport/unixconn.py +++ b/docker/transport/unixconn.py @@ -1,12 +1,12 @@ -import requests.adapters import socket -from docker.transport.basehttpadapter import BaseHTTPAdapter -from .. import constants - +import requests.adapters import urllib3 import urllib3.connection +from docker.transport.basehttpadapter import BaseHTTPAdapter + +from .. import constants RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer diff --git a/docker/types/__init__.py b/docker/types/__init__.py index 89f223893..fbe247210 100644 --- a/docker/types/__init__.py +++ b/docker/types/__init__.py @@ -1,13 +1,24 @@ -from .containers import ( - ContainerConfig, HostConfig, LogConfig, Ulimit, DeviceRequest -) +from .containers import ContainerConfig, DeviceRequest, HostConfig, LogConfig, Ulimit from .daemon import CancellableStream from .healthcheck import Healthcheck from .networks import EndpointConfig, IPAMConfig, IPAMPool, NetworkingConfig from .services import ( - ConfigReference, ContainerSpec, DNSConfig, DriverConfig, EndpointSpec, - Mount, Placement, PlacementPreference, Privileges, Resources, - RestartPolicy, RollbackConfig, SecretReference, ServiceMode, TaskTemplate, - UpdateConfig, NetworkAttachmentConfig + ConfigReference, + ContainerSpec, + DNSConfig, + DriverConfig, + EndpointSpec, + Mount, + NetworkAttachmentConfig, + Placement, + PlacementPreference, + Privileges, + Resources, + RestartPolicy, + RollbackConfig, + SecretReference, + ServiceMode, + TaskTemplate, + UpdateConfig, ) -from .swarm import SwarmSpec, SwarmExternalCA +from .swarm import SwarmExternalCA, SwarmSpec diff --git a/docker/types/containers.py b/docker/types/containers.py index a28061383..598188a25 100644 --- a/docker/types/containers.py +++ b/docker/types/containers.py @@ -1,8 +1,16 @@ from .. import errors from ..utils.utils import ( - convert_port_bindings, convert_tmpfs_mounts, convert_volume_binds, - format_environment, format_extra_hosts, normalize_links, parse_bytes, - parse_devices, split_command, version_gte, version_lt, + convert_port_bindings, + convert_tmpfs_mounts, + convert_volume_binds, + format_environment, + format_extra_hosts, + normalize_links, + parse_bytes, + parse_devices, + split_command, + version_gte, + version_lt, ) from .base import DictType from .healthcheck import Healthcheck diff --git a/docker/types/services.py b/docker/types/services.py index 0b07c350e..821115411 100644 --- a/docker/types/services.py +++ b/docker/types/services.py @@ -1,8 +1,12 @@ from .. import errors from ..constants import IS_WINDOWS_PLATFORM from ..utils import ( - check_resource, format_environment, format_extra_hosts, parse_bytes, - split_command, convert_service_networks, + check_resource, + convert_service_networks, + format_environment, + format_extra_hosts, + parse_bytes, + split_command, ) diff --git a/docker/utils/__init__.py b/docker/utils/__init__.py index b4bef7d47..c086a9f07 100644 --- a/docker/utils/__init__.py +++ b/docker/utils/__init__.py @@ -1,13 +1,28 @@ -from .build import match_tag, create_archive, exclude_paths, mkbuildcontext, tar +from .build import create_archive, exclude_paths, match_tag, mkbuildcontext, tar from .decorators import check_resource, minimum_version, update_headers from .utils import ( - compare_version, convert_port_bindings, convert_volume_binds, - parse_repository_tag, parse_host, - kwargs_from_env, convert_filters, datetime_to_timestamp, - create_host_config, parse_bytes, parse_env_file, version_lt, - version_gte, decode_json_header, split_command, create_ipam_config, - create_ipam_pool, parse_devices, normalize_links, convert_service_networks, - format_environment, format_extra_hosts + compare_version, + convert_filters, + convert_port_bindings, + convert_service_networks, + convert_volume_binds, + create_host_config, + create_ipam_config, + create_ipam_pool, + datetime_to_timestamp, + decode_json_header, + format_environment, + format_extra_hosts, + kwargs_from_env, + normalize_links, + parse_bytes, + parse_devices, + parse_env_file, + parse_host, + parse_repository_tag, + split_command, + version_gte, + version_lt, ) diff --git a/docker/utils/build.py b/docker/utils/build.py index 86a4423f0..b84139104 100644 --- a/docker/utils/build.py +++ b/docker/utils/build.py @@ -4,9 +4,8 @@ import tarfile import tempfile -from .fnmatch import fnmatch from ..constants import IS_WINDOWS_PLATFORM - +from .fnmatch import fnmatch _SEP = re.compile('/|\\\\') if IS_WINDOWS_PLATFORM else re.compile('/') _TAG = re.compile( diff --git a/docker/utils/json_stream.py b/docker/utils/json_stream.py index 266193e56..41d25920c 100644 --- a/docker/utils/json_stream.py +++ b/docker/utils/json_stream.py @@ -3,7 +3,6 @@ from ..errors import StreamParseError - json_decoder = json.JSONDecoder() diff --git a/docker/utils/utils.py b/docker/utils/utils.py index e1e064385..f36a3afb8 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -8,16 +8,17 @@ from datetime import datetime, timezone from functools import lru_cache from itertools import zip_longest +from urllib.parse import urlparse, urlunparse from .. import errors -from ..constants import DEFAULT_HTTP_HOST -from ..constants import DEFAULT_UNIX_SOCKET -from ..constants import DEFAULT_NPIPE -from ..constants import BYTE_UNITS +from ..constants import ( + BYTE_UNITS, + DEFAULT_HTTP_HOST, + DEFAULT_NPIPE, + DEFAULT_UNIX_SOCKET, +) from ..tls import TLSConfig -from urllib.parse import urlparse, urlunparse - URLComponents = collections.namedtuple( 'URLComponents', 'scheme netloc url params query fragment', diff --git a/docker/version.py b/docker/version.py index dca45bf04..72b12b84d 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,7 +1,7 @@ try: from ._version import __version__ except ImportError: - from importlib.metadata import version, PackageNotFoundError + from importlib.metadata import PackageNotFoundError, version try: __version__ = version('docker') except PackageNotFoundError: diff --git a/docs/conf.py b/docs/conf.py index a529f8be8..02694d3cd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -19,6 +19,7 @@ import os import sys from importlib.metadata import version + sys.path.insert(0, os.path.abspath('..')) diff --git a/pyproject.toml b/pyproject.toml index a64e120ee..96fb27228 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,7 @@ extend-select = [ "B", "C", "F", + "I", "UP", "W", ] diff --git a/setup.py b/setup.py index 3d3313924..b939ec58d 100644 --- a/setup.py +++ b/setup.py @@ -3,8 +3,7 @@ import codecs import os -from setuptools import find_packages -from setuptools import setup +from setuptools import find_packages, setup ROOT_DIR = os.path.dirname(__file__) SOURCE_DIR = os.path.join(ROOT_DIR) diff --git a/tests/helpers.py b/tests/helpers.py index 748ee70a7..3d60a3faf 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -8,10 +8,11 @@ import tempfile import time -import docker import paramiko import pytest +import docker + def make_tree(dirs, files): base = tempfile.mkdtemp() diff --git a/tests/integration/api_build_test.py b/tests/integration/api_build_test.py index 540ef2b0f..62e93a738 100644 --- a/tests/integration/api_build_test.py +++ b/tests/integration/api_build_test.py @@ -3,13 +3,13 @@ import shutil import tempfile +import pytest + from docker import errors from docker.utils.proxy import ProxyConfig -import pytest - -from .base import BaseAPIIntegrationTest, TEST_IMG from ..helpers import random_name, requires_api_version, requires_experimental +from .base import TEST_IMG, BaseAPIIntegrationTest class BuildTest(BaseAPIIntegrationTest): diff --git a/tests/integration/api_config_test.py b/tests/integration/api_config_test.py index 982ec468a..4261599d8 100644 --- a/tests/integration/api_config_test.py +++ b/tests/integration/api_config_test.py @@ -1,6 +1,7 @@ -import docker import pytest +import docker + from ..helpers import force_leave_swarm, requires_api_version from .base import BaseAPIIntegrationTest diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py index aa27fbfd7..0215e14c2 100644 --- a/tests/integration/api_container_test.py +++ b/tests/integration/api_container_test.py @@ -9,15 +9,17 @@ import requests import docker -from .. import helpers -from ..helpers import assert_cat_socket_detached_with_keys -from ..helpers import ctrl_with -from ..helpers import requires_api_version, skip_if_desktop -from .base import BaseAPIIntegrationTest -from .base import TEST_IMG from docker.constants import IS_WINDOWS_PLATFORM -from docker.utils.socket import next_frame_header -from docker.utils.socket import read_exactly +from docker.utils.socket import next_frame_header, read_exactly + +from .. import helpers +from ..helpers import ( + assert_cat_socket_detached_with_keys, + ctrl_with, + requires_api_version, + skip_if_desktop, +) +from .base import TEST_IMG, BaseAPIIntegrationTest class ListContainersTest(BaseAPIIntegrationTest): diff --git a/tests/integration/api_exec_test.py b/tests/integration/api_exec_test.py index 4d7748f5e..5b829e287 100644 --- a/tests/integration/api_exec_test.py +++ b/tests/integration/api_exec_test.py @@ -1,11 +1,12 @@ -from ..helpers import assert_cat_socket_detached_with_keys -from ..helpers import ctrl_with -from ..helpers import requires_api_version -from .base import BaseAPIIntegrationTest -from .base import TEST_IMG from docker.utils.proxy import ProxyConfig -from docker.utils.socket import next_frame_header -from docker.utils.socket import read_exactly +from docker.utils.socket import next_frame_header, read_exactly + +from ..helpers import ( + assert_cat_socket_detached_with_keys, + ctrl_with, + requires_api_version, +) +from .base import TEST_IMG, BaseAPIIntegrationTest class ExecTest(BaseAPIIntegrationTest): diff --git a/tests/integration/api_healthcheck_test.py b/tests/integration/api_healthcheck_test.py index 9ecdcd86a..f00d804b4 100644 --- a/tests/integration/api_healthcheck_test.py +++ b/tests/integration/api_healthcheck_test.py @@ -1,5 +1,5 @@ -from .base import BaseAPIIntegrationTest, TEST_IMG from .. import helpers +from .base import TEST_IMG, BaseAPIIntegrationTest SECOND = 1000000000 diff --git a/tests/integration/api_image_test.py b/tests/integration/api_image_test.py index 5c3721958..d3915c9b5 100644 --- a/tests/integration/api_image_test.py +++ b/tests/integration/api_image_test.py @@ -2,19 +2,18 @@ import json import shutil import socket +import socketserver import tarfile import tempfile import threading - -import pytest from http.server import SimpleHTTPRequestHandler -import socketserver +import pytest import docker from ..helpers import requires_api_version, requires_experimental -from .base import BaseAPIIntegrationTest, TEST_IMG +from .base import TEST_IMG, BaseAPIIntegrationTest class ListImagesTest(BaseAPIIntegrationTest): diff --git a/tests/integration/api_network_test.py b/tests/integration/api_network_test.py index 6689044b6..ce2e8ea4c 100644 --- a/tests/integration/api_network_test.py +++ b/tests/integration/api_network_test.py @@ -1,9 +1,10 @@ +import pytest + import docker from docker.types import IPAMConfig, IPAMPool -import pytest from ..helpers import random_name, requires_api_version -from .base import BaseAPIIntegrationTest, TEST_IMG +from .base import TEST_IMG, BaseAPIIntegrationTest class TestNetworks(BaseAPIIntegrationTest): diff --git a/tests/integration/api_plugin_test.py b/tests/integration/api_plugin_test.py index 3f1633900..168c81b23 100644 --- a/tests/integration/api_plugin_test.py +++ b/tests/integration/api_plugin_test.py @@ -1,10 +1,11 @@ import os -import docker import pytest -from .base import BaseAPIIntegrationTest +import docker + from ..helpers import requires_api_version +from .base import BaseAPIIntegrationTest SSHFS = 'vieux/sshfs:latest' diff --git a/tests/integration/api_secret_test.py b/tests/integration/api_secret_test.py index fd9854341..588aaeb99 100644 --- a/tests/integration/api_secret_test.py +++ b/tests/integration/api_secret_test.py @@ -1,6 +1,7 @@ -import docker import pytest +import docker + from ..helpers import force_leave_swarm, requires_api_version from .base import BaseAPIIntegrationTest diff --git a/tests/integration/api_service_test.py b/tests/integration/api_service_test.py index dec3fa007..7a7ae4ea4 100644 --- a/tests/integration/api_service_test.py +++ b/tests/integration/api_service_test.py @@ -1,13 +1,12 @@ import random import time -import docker import pytest -from ..helpers import ( - force_leave_swarm, requires_api_version, requires_experimental -) -from .base import BaseAPIIntegrationTest, TEST_IMG +import docker + +from ..helpers import force_leave_swarm, requires_api_version, requires_experimental +from .base import TEST_IMG, BaseAPIIntegrationTest class ServiceTest(BaseAPIIntegrationTest): diff --git a/tests/integration/api_swarm_test.py b/tests/integration/api_swarm_test.py index b4125d24d..00477e103 100644 --- a/tests/integration/api_swarm_test.py +++ b/tests/integration/api_swarm_test.py @@ -1,7 +1,9 @@ import copy -import docker + import pytest +import docker + from ..helpers import force_leave_swarm, requires_api_version from .base import BaseAPIIntegrationTest diff --git a/tests/integration/api_volume_test.py b/tests/integration/api_volume_test.py index 2085e8311..ecd19da2d 100644 --- a/tests/integration/api_volume_test.py +++ b/tests/integration/api_volume_test.py @@ -1,6 +1,7 @@ -import docker import pytest +import docker + from ..helpers import requires_api_version from .base import BaseAPIIntegrationTest diff --git a/tests/integration/base.py b/tests/integration/base.py index e4073757e..51ee05daa 100644 --- a/tests/integration/base.py +++ b/tests/integration/base.py @@ -3,9 +3,10 @@ import unittest import docker -from .. import helpers from docker.utils import kwargs_from_env +from .. import helpers + TEST_IMG = 'alpine:3.10' TEST_API_VERSION = os.environ.get('DOCKER_TEST_API_VERSION') diff --git a/tests/integration/client_test.py b/tests/integration/client_test.py index 7df172c88..1d1be077e 100644 --- a/tests/integration/client_test.py +++ b/tests/integration/client_test.py @@ -1,10 +1,9 @@ import threading import unittest +from datetime import datetime, timedelta import docker -from datetime import datetime, timedelta - from ..helpers import requires_api_version from .base import TEST_API_VERSION diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index ae9459558..443c5b795 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -1,9 +1,10 @@ import sys import warnings +import pytest + import docker.errors from docker.utils import kwargs_from_env -import pytest from .base import TEST_IMG diff --git a/tests/integration/context_api_test.py b/tests/integration/context_api_test.py index 1a13f2817..2131ebe74 100644 --- a/tests/integration/context_api_test.py +++ b/tests/integration/context_api_test.py @@ -1,9 +1,12 @@ import os import tempfile + import pytest + from docker import errors from docker.context import ContextAPI from docker.tls import TLSConfig + from .base import BaseAPIIntegrationTest diff --git a/tests/integration/credentials/store_test.py b/tests/integration/credentials/store_test.py index 82ea84741..e1eba33a1 100644 --- a/tests/integration/credentials/store_test.py +++ b/tests/integration/credentials/store_test.py @@ -6,8 +6,11 @@ import pytest from docker.credentials import ( - CredentialsNotFound, Store, StoreError, DEFAULT_LINUX_STORE, - DEFAULT_OSX_STORE + DEFAULT_LINUX_STORE, + DEFAULT_OSX_STORE, + CredentialsNotFound, + Store, + StoreError, ) diff --git a/tests/integration/credentials/utils_test.py b/tests/integration/credentials/utils_test.py index 464403979..75bdea100 100644 --- a/tests/integration/credentials/utils_test.py +++ b/tests/integration/credentials/utils_test.py @@ -1,7 +1,7 @@ import os +from unittest import mock from docker.credentials.utils import create_environment_dict -from unittest import mock @mock.patch.dict(os.environ) diff --git a/tests/integration/errors_test.py b/tests/integration/errors_test.py index e2fce48b0..438caacbc 100644 --- a/tests/integration/errors_test.py +++ b/tests/integration/errors_test.py @@ -1,7 +1,9 @@ -from docker.errors import APIError -from .base import BaseAPIIntegrationTest, TEST_IMG import pytest +from docker.errors import APIError + +from .base import TEST_IMG, BaseAPIIntegrationTest + class ErrorsTest(BaseAPIIntegrationTest): def test_api_error_parses_json(self): diff --git a/tests/integration/models_containers_test.py b/tests/integration/models_containers_test.py index 219b9a4cb..f2813e74e 100644 --- a/tests/integration/models_containers_test.py +++ b/tests/integration/models_containers_test.py @@ -5,10 +5,9 @@ import pytest import docker -from .base import BaseIntegrationTest -from .base import TEST_API_VERSION -from ..helpers import random_name -from ..helpers import requires_api_version + +from ..helpers import random_name, requires_api_version +from .base import TEST_API_VERSION, BaseIntegrationTest class ContainerCollectionTest(BaseIntegrationTest): diff --git a/tests/integration/models_images_test.py b/tests/integration/models_images_test.py index d335da4a7..9d42cc48f 100644 --- a/tests/integration/models_images_test.py +++ b/tests/integration/models_images_test.py @@ -1,11 +1,12 @@ import io import tempfile -import docker import pytest -from .base import BaseIntegrationTest, TEST_IMG, TEST_API_VERSION +import docker + from ..helpers import random_name +from .base import TEST_API_VERSION, TEST_IMG, BaseIntegrationTest class ImageCollectionTest(BaseIntegrationTest): diff --git a/tests/integration/models_networks_test.py b/tests/integration/models_networks_test.py index f4052e4ba..f5e6fcf57 100644 --- a/tests/integration/models_networks_test.py +++ b/tests/integration/models_networks_test.py @@ -1,6 +1,7 @@ import docker + from .. import helpers -from .base import BaseIntegrationTest, TEST_API_VERSION +from .base import TEST_API_VERSION, BaseIntegrationTest class NetworkCollectionTest(BaseIntegrationTest): diff --git a/tests/integration/models_resources_test.py b/tests/integration/models_resources_test.py index 4aafe0cc7..7d9762702 100644 --- a/tests/integration/models_resources_test.py +++ b/tests/integration/models_resources_test.py @@ -1,5 +1,6 @@ import docker -from .base import BaseIntegrationTest, TEST_API_VERSION + +from .base import TEST_API_VERSION, BaseIntegrationTest class ModelTest(BaseIntegrationTest): diff --git a/tests/integration/models_services_test.py b/tests/integration/models_services_test.py index f1439a418..947ba46d2 100644 --- a/tests/integration/models_services_test.py +++ b/tests/integration/models_services_test.py @@ -1,13 +1,14 @@ import unittest -import docker import pytest -from .. import helpers -from .base import TEST_API_VERSION +import docker from docker.errors import InvalidArgument from docker.types.services import ServiceMode +from .. import helpers +from .base import TEST_API_VERSION + class ServiceTest(unittest.TestCase): @classmethod diff --git a/tests/integration/models_swarm_test.py b/tests/integration/models_swarm_test.py index 6c1836dc6..f43824c75 100644 --- a/tests/integration/models_swarm_test.py +++ b/tests/integration/models_swarm_test.py @@ -1,10 +1,11 @@ import unittest +import pytest + import docker from .. import helpers from .base import TEST_API_VERSION -import pytest class SwarmTest(unittest.TestCase): diff --git a/tests/integration/models_volumes_test.py b/tests/integration/models_volumes_test.py index 47b4a4550..7d3ffda99 100644 --- a/tests/integration/models_volumes_test.py +++ b/tests/integration/models_volumes_test.py @@ -1,5 +1,6 @@ import docker -from .base import BaseIntegrationTest, TEST_API_VERSION + +from .base import TEST_API_VERSION, BaseIntegrationTest class VolumesTest(BaseIntegrationTest): diff --git a/tests/integration/regression_test.py b/tests/integration/regression_test.py index 7d2b228cc..5df9d3121 100644 --- a/tests/integration/regression_test.py +++ b/tests/integration/regression_test.py @@ -1,10 +1,11 @@ import io import random +import pytest + import docker -from .base import BaseAPIIntegrationTest, TEST_IMG -import pytest +from .base import TEST_IMG, BaseAPIIntegrationTest class TestRegressions(BaseAPIIntegrationTest): diff --git a/tests/ssh/api_build_test.py b/tests/ssh/api_build_test.py index 3b542994f..20476fc74 100644 --- a/tests/ssh/api_build_test.py +++ b/tests/ssh/api_build_test.py @@ -3,13 +3,13 @@ import shutil import tempfile +import pytest + from docker import errors from docker.utils.proxy import ProxyConfig -import pytest - -from .base import BaseAPIIntegrationTest, TEST_IMG from ..helpers import random_name, requires_api_version, requires_experimental +from .base import TEST_IMG, BaseAPIIntegrationTest class BuildTest(BaseAPIIntegrationTest): diff --git a/tests/ssh/base.py b/tests/ssh/base.py index d6ff130a1..bf3c11d7a 100644 --- a/tests/ssh/base.py +++ b/tests/ssh/base.py @@ -5,9 +5,10 @@ import pytest import docker -from .. import helpers from docker.utils import kwargs_from_env +from .. import helpers + TEST_IMG = 'alpine:3.10' TEST_API_VERSION = os.environ.get('DOCKER_TEST_API_VERSION') diff --git a/tests/ssh/connect_test.py b/tests/ssh/connect_test.py index 3d33a96db..8780e3b8b 100644 --- a/tests/ssh/connect_test.py +++ b/tests/ssh/connect_test.py @@ -1,9 +1,11 @@ import os import unittest -import docker import paramiko.ssh_exception import pytest + +import docker + from .base import TEST_API_VERSION diff --git a/tests/unit/api_container_test.py b/tests/unit/api_container_test.py index c4e2250be..b2e5237a2 100644 --- a/tests/unit/api_container_test.py +++ b/tests/unit/api_container_test.py @@ -1,17 +1,22 @@ import datetime import json import signal +from unittest import mock + +import pytest import docker from docker.api import APIClient -from unittest import mock -import pytest -from . import fake_api from ..helpers import requires_api_version +from . import fake_api from .api_test import ( - BaseAPIClientTest, url_prefix, fake_request, DEFAULT_TIMEOUT_SECONDS, - fake_inspect_container, url_base + DEFAULT_TIMEOUT_SECONDS, + BaseAPIClientTest, + fake_inspect_container, + fake_request, + url_base, + url_prefix, ) diff --git a/tests/unit/api_exec_test.py b/tests/unit/api_exec_test.py index 1760239fd..9d789723a 100644 --- a/tests/unit/api_exec_test.py +++ b/tests/unit/api_exec_test.py @@ -2,7 +2,10 @@ from . import fake_api from .api_test import ( - BaseAPIClientTest, url_prefix, fake_request, DEFAULT_TIMEOUT_SECONDS, + DEFAULT_TIMEOUT_SECONDS, + BaseAPIClientTest, + fake_request, + url_prefix, ) diff --git a/tests/unit/api_image_test.py b/tests/unit/api_image_test.py index 22b27fe0d..148109d37 100644 --- a/tests/unit/api_image_test.py +++ b/tests/unit/api_image_test.py @@ -1,12 +1,17 @@ -import docker +from unittest import mock + import pytest -from . import fake_api +import docker from docker import auth -from unittest import mock + +from . import fake_api from .api_test import ( - BaseAPIClientTest, fake_request, DEFAULT_TIMEOUT_SECONDS, url_prefix, - fake_resolve_authconfig + DEFAULT_TIMEOUT_SECONDS, + BaseAPIClientTest, + fake_request, + fake_resolve_authconfig, + url_prefix, ) diff --git a/tests/unit/api_network_test.py b/tests/unit/api_network_test.py index d3daa44c4..1f9e59665 100644 --- a/tests/unit/api_network_test.py +++ b/tests/unit/api_network_test.py @@ -1,8 +1,9 @@ import json +from unittest import mock -from .api_test import BaseAPIClientTest, url_prefix, response from docker.types import IPAMConfig, IPAMPool -from unittest import mock + +from .api_test import BaseAPIClientTest, response, url_prefix class NetworkTest(BaseAPIClientTest): diff --git a/tests/unit/api_test.py b/tests/unit/api_test.py index 0ca9bbb95..3ce127b34 100644 --- a/tests/unit/api_test.py +++ b/tests/unit/api_test.py @@ -1,29 +1,29 @@ import datetime +import http.server import io import json import os import re import shutil import socket +import socketserver import struct import tempfile import threading import time import unittest -import socketserver -import http.server +from unittest import mock -import docker import pytest import requests import urllib3 + +import docker from docker.api import APIClient from docker.constants import DEFAULT_DOCKER_API_VERSION -from unittest import mock from . import fake_api - DEFAULT_TIMEOUT_SECONDS = docker.constants.DEFAULT_TIMEOUT_SECONDS diff --git a/tests/unit/api_volume_test.py b/tests/unit/api_volume_test.py index 0a97ca515..fd3206396 100644 --- a/tests/unit/api_volume_test.py +++ b/tests/unit/api_volume_test.py @@ -3,7 +3,7 @@ import pytest from ..helpers import requires_api_version -from .api_test import BaseAPIClientTest, url_prefix, fake_request +from .api_test import BaseAPIClientTest, fake_request, url_prefix class VolumeTest(BaseAPIClientTest): diff --git a/tests/unit/auth_test.py b/tests/unit/auth_test.py index 0ed890fdf..b2fedb32e 100644 --- a/tests/unit/auth_test.py +++ b/tests/unit/auth_test.py @@ -6,11 +6,12 @@ import shutil import tempfile import unittest - -from docker import auth, credentials, errors from unittest import mock + import pytest +from docker import auth, credentials, errors + class RegressionTest(unittest.TestCase): def test_803_urlsafe_encode(self): diff --git a/tests/unit/client_test.py b/tests/unit/client_test.py index 7012b2123..60a6d5c0f 100644 --- a/tests/unit/client_test.py +++ b/tests/unit/client_test.py @@ -1,15 +1,18 @@ import datetime import os import unittest +from unittest import mock -import docker import pytest + +import docker from docker.constants import ( - DEFAULT_DOCKER_API_VERSION, DEFAULT_TIMEOUT_SECONDS, - DEFAULT_MAX_POOL_SIZE, IS_WINDOWS_PLATFORM + DEFAULT_DOCKER_API_VERSION, + DEFAULT_MAX_POOL_SIZE, + DEFAULT_TIMEOUT_SECONDS, + IS_WINDOWS_PLATFORM, ) from docker.utils import kwargs_from_env -from unittest import mock from . import fake_api diff --git a/tests/unit/context_test.py b/tests/unit/context_test.py index 25f0d8c6b..9e9fc9ba1 100644 --- a/tests/unit/context_test.py +++ b/tests/unit/context_test.py @@ -1,10 +1,10 @@ import unittest -import docker + import pytest -from docker.constants import DEFAULT_UNIX_SOCKET -from docker.constants import DEFAULT_NPIPE -from docker.constants import IS_WINDOWS_PLATFORM -from docker.context import ContextAPI, Context + +import docker +from docker.constants import DEFAULT_NPIPE, DEFAULT_UNIX_SOCKET, IS_WINDOWS_PLATFORM +from docker.context import Context, ContextAPI class BaseContextTest(unittest.TestCase): diff --git a/tests/unit/dockertypes_test.py b/tests/unit/dockertypes_test.py index f3d562e10..03e7d2eda 100644 --- a/tests/unit/dockertypes_test.py +++ b/tests/unit/dockertypes_test.py @@ -1,15 +1,22 @@ import unittest +from unittest import mock import pytest from docker.constants import DEFAULT_DOCKER_API_VERSION from docker.errors import InvalidArgument, InvalidVersion from docker.types import ( - ContainerSpec, EndpointConfig, HostConfig, IPAMConfig, - IPAMPool, LogConfig, Mount, ServiceMode, Ulimit, + ContainerSpec, + EndpointConfig, + HostConfig, + IPAMConfig, + IPAMPool, + LogConfig, + Mount, + ServiceMode, + Ulimit, ) from docker.types.services import convert_service_ports -from unittest import mock def create_host_config(*args, **kwargs): diff --git a/tests/unit/errors_test.py b/tests/unit/errors_test.py index f8c3a6663..5ccc40474 100644 --- a/tests/unit/errors_test.py +++ b/tests/unit/errors_test.py @@ -2,9 +2,14 @@ import requests -from docker.errors import (APIError, ContainerError, DockerException, - create_unexpected_kwargs_error, - create_api_error_from_http_exception) +from docker.errors import ( + APIError, + ContainerError, + DockerException, + create_api_error_from_http_exception, + create_unexpected_kwargs_error, +) + from .fake_api import FAKE_CONTAINER_ID, FAKE_IMAGE_ID from .fake_api_client import make_fake_client diff --git a/tests/unit/fake_api_client.py b/tests/unit/fake_api_client.py index 797994216..017e99d0c 100644 --- a/tests/unit/fake_api_client.py +++ b/tests/unit/fake_api_client.py @@ -1,8 +1,9 @@ import copy +from unittest import mock import docker from docker.constants import DEFAULT_DOCKER_API_VERSION -from unittest import mock + from . import fake_api diff --git a/tests/unit/models_configs_test.py b/tests/unit/models_configs_test.py index 5d52daf76..9f1083068 100644 --- a/tests/unit/models_configs_test.py +++ b/tests/unit/models_configs_test.py @@ -1,7 +1,8 @@ import unittest -from .fake_api_client import make_fake_client from .fake_api import FAKE_CONFIG_NAME +from .fake_api_client import make_fake_client + class CreateConfigsTest(unittest.TestCase): def test_create_config(self): diff --git a/tests/unit/models_containers_test.py b/tests/unit/models_containers_test.py index 05005815f..0e2ae341a 100644 --- a/tests/unit/models_containers_test.py +++ b/tests/unit/models_containers_test.py @@ -3,12 +3,12 @@ import pytest import docker -from docker.constants import DEFAULT_DATA_CHUNK_SIZE, \ - DEFAULT_DOCKER_API_VERSION +from docker.constants import DEFAULT_DATA_CHUNK_SIZE, DEFAULT_DOCKER_API_VERSION from docker.models.containers import Container, _create_container_args from docker.models.images import Image from docker.types import EndpointConfig -from .fake_api import FAKE_CONTAINER_ID, FAKE_IMAGE_ID, FAKE_EXEC_ID + +from .fake_api import FAKE_CONTAINER_ID, FAKE_EXEC_ID, FAKE_IMAGE_ID from .fake_api_client import make_fake_client diff --git a/tests/unit/models_networks_test.py b/tests/unit/models_networks_test.py index f10e1e3e3..099fb2193 100644 --- a/tests/unit/models_networks_test.py +++ b/tests/unit/models_networks_test.py @@ -1,6 +1,6 @@ import unittest -from .fake_api import FAKE_NETWORK_ID, FAKE_CONTAINER_ID +from .fake_api import FAKE_CONTAINER_ID, FAKE_NETWORK_ID from .fake_api_client import make_fake_client diff --git a/tests/unit/models_secrets_test.py b/tests/unit/models_secrets_test.py index 1c261a871..1f5aaace2 100644 --- a/tests/unit/models_secrets_test.py +++ b/tests/unit/models_secrets_test.py @@ -1,7 +1,7 @@ import unittest -from .fake_api_client import make_fake_client from .fake_api import FAKE_SECRET_NAME +from .fake_api_client import make_fake_client class CreateServiceTest(unittest.TestCase): diff --git a/tests/unit/models_services_test.py b/tests/unit/models_services_test.py index 45c63ac9e..027756343 100644 --- a/tests/unit/models_services_test.py +++ b/tests/unit/models_services_test.py @@ -1,4 +1,5 @@ import unittest + from docker.models.services import _get_create_service_kwargs diff --git a/tests/unit/sshadapter_test.py b/tests/unit/sshadapter_test.py index 874239ac8..873666210 100644 --- a/tests/unit/sshadapter_test.py +++ b/tests/unit/sshadapter_test.py @@ -1,4 +1,5 @@ import unittest + import docker from docker.transport.sshconn import SSHSocket diff --git a/tests/unit/swarm_test.py b/tests/unit/swarm_test.py index 3fc7c68cd..4c0f2fd00 100644 --- a/tests/unit/swarm_test.py +++ b/tests/unit/swarm_test.py @@ -1,8 +1,8 @@ import json -from . import fake_api from ..helpers import requires_api_version -from .api_test import BaseAPIClientTest, url_prefix, fake_request +from . import fake_api +from .api_test import BaseAPIClientTest, fake_request, url_prefix class SwarmTest(BaseAPIClientTest): diff --git a/tests/unit/utils_build_test.py b/tests/unit/utils_build_test.py index 5f1bb1ec0..2089afb49 100644 --- a/tests/unit/utils_build_test.py +++ b/tests/unit/utils_build_test.py @@ -9,7 +9,7 @@ import pytest from docker.constants import IS_WINDOWS_PLATFORM -from docker.utils import exclude_paths, tar, match_tag +from docker.utils import exclude_paths, match_tag, tar from ..helpers import make_tree diff --git a/tests/unit/utils_config_test.py b/tests/unit/utils_config_test.py index 27d5a7cd4..c87231a99 100644 --- a/tests/unit/utils_config_test.py +++ b/tests/unit/utils_config_test.py @@ -1,12 +1,12 @@ +import json import os -import unittest import shutil import tempfile -import json - -from pytest import mark, fixture +import unittest from unittest import mock +from pytest import fixture, mark + from docker.utils import config diff --git a/tests/unit/utils_json_stream_test.py b/tests/unit/utils_json_stream_test.py index 821ebe42d..5a8310cb5 100644 --- a/tests/unit/utils_json_stream_test.py +++ b/tests/unit/utils_json_stream_test.py @@ -1,4 +1,4 @@ -from docker.utils.json_stream import json_splitter, stream_as_text, json_stream +from docker.utils.json_stream import json_splitter, json_stream, stream_as_text class TestJsonSplitter: diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py index c9434e11b..21da0b58e 100644 --- a/tests/unit/utils_test.py +++ b/tests/unit/utils_test.py @@ -7,14 +7,26 @@ import unittest import pytest + from docker.api.client import APIClient -from docker.constants import IS_WINDOWS_PLATFORM, DEFAULT_DOCKER_API_VERSION +from docker.constants import DEFAULT_DOCKER_API_VERSION, IS_WINDOWS_PLATFORM from docker.errors import DockerException from docker.utils import ( - compare_version, convert_filters, convert_volume_binds, decode_json_header, - format_environment, kwargs_from_env, parse_bytes, parse_devices, - parse_env_file, parse_host, parse_repository_tag, split_command, - update_headers, version_gte, version_lt + compare_version, + convert_filters, + convert_volume_binds, + decode_json_header, + format_environment, + kwargs_from_env, + parse_bytes, + parse_devices, + parse_env_file, + parse_host, + parse_repository_tag, + split_command, + update_headers, + version_gte, + version_lt, ) from docker.utils.ports import build_port_bindings, split_port