Run pre-commit on all files
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
parent
fae6454661
commit
59d4f304ee
64 changed files with 250 additions and 223 deletions
|
|
@ -3,4 +3,4 @@ dnebase:
|
|||
command: /bin/true
|
||||
environment:
|
||||
- FOO=1
|
||||
- BAR=1
|
||||
- BAR=1
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@ dnechild:
|
|||
image: busybox
|
||||
command: /bin/true
|
||||
environment:
|
||||
- BAR=2
|
||||
- BAR=2
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
definedinyamlnotyml:
|
||||
image: busybox:latest
|
||||
command: top
|
||||
command: top
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
from __future__ import absolute_import
|
||||
from operator import attrgetter
|
||||
import sys
|
||||
|
||||
import os
|
||||
import shlex
|
||||
import sys
|
||||
from operator import attrgetter
|
||||
|
||||
from six import StringIO
|
||||
from mock import patch
|
||||
from six import StringIO
|
||||
|
||||
from .testcases import DockerClientTestCase
|
||||
from compose.cli.main import TopLevelCommand
|
||||
from compose.cli.errors import UserError
|
||||
from compose.cli.main import TopLevelCommand
|
||||
from compose.project import NoSuchService
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
import unittest
|
||||
from mock import Mock
|
||||
|
||||
from docker.errors import APIError
|
||||
from mock import Mock
|
||||
|
||||
from .testcases import DockerClientTestCase
|
||||
from compose import legacy
|
||||
from compose.project import Project
|
||||
from .testcases import DockerClientTestCase
|
||||
|
||||
|
||||
class UtilitiesTestCase(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
from __future__ import unicode_literals
|
||||
|
||||
from .testcases import DockerClientTestCase
|
||||
from compose import config
|
||||
from compose.const import LABEL_PROJECT
|
||||
from compose.project import Project
|
||||
from compose.container import Container
|
||||
from .testcases import DockerClientTestCase
|
||||
from compose.project import Project
|
||||
|
||||
|
||||
def build_service_dicts(service_config):
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import mock
|
||||
|
||||
from compose.project import Project
|
||||
from .testcases import DockerClientTestCase
|
||||
from compose.project import Project
|
||||
|
||||
|
||||
class ResilienceTest(DockerClientTestCase):
|
||||
|
|
|
|||
|
|
@ -1,30 +1,28 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
import shutil
|
||||
import tempfile
|
||||
from os import path
|
||||
|
||||
from docker.errors import APIError
|
||||
from mock import patch
|
||||
import tempfile
|
||||
import shutil
|
||||
from six import StringIO, text_type
|
||||
from six import StringIO
|
||||
from six import text_type
|
||||
|
||||
from compose import __version__
|
||||
from compose.const import (
|
||||
LABEL_CONTAINER_NUMBER,
|
||||
LABEL_ONE_OFF,
|
||||
LABEL_PROJECT,
|
||||
LABEL_SERVICE,
|
||||
LABEL_VERSION,
|
||||
)
|
||||
from compose.service import (
|
||||
ConfigError,
|
||||
ConvergencePlan,
|
||||
Service,
|
||||
build_extra_hosts,
|
||||
)
|
||||
from compose.container import Container
|
||||
from .testcases import DockerClientTestCase
|
||||
from compose import __version__
|
||||
from compose.const import LABEL_CONTAINER_NUMBER
|
||||
from compose.const import LABEL_ONE_OFF
|
||||
from compose.const import LABEL_PROJECT
|
||||
from compose.const import LABEL_SERVICE
|
||||
from compose.const import LABEL_VERSION
|
||||
from compose.container import Container
|
||||
from compose.service import build_extra_hosts
|
||||
from compose.service import ConfigError
|
||||
from compose.service import ConvergencePlan
|
||||
from compose.service import Service
|
||||
|
||||
|
||||
def create_and_start_container(service, **override_options):
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
from __future__ import unicode_literals
|
||||
import tempfile
|
||||
import shutil
|
||||
import os
|
||||
|
||||
from compose import config
|
||||
from compose.project import Project
|
||||
from compose.const import LABEL_CONFIG_HASH
|
||||
import os
|
||||
import shutil
|
||||
import tempfile
|
||||
|
||||
from .testcases import DockerClientTestCase
|
||||
from compose import config
|
||||
from compose.const import LABEL_CONFIG_HASH
|
||||
from compose.project import Project
|
||||
|
||||
|
||||
class ProjectTestCase(DockerClientTestCase):
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
from compose.service import Service
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from .. import unittest
|
||||
from compose.cli.docker_client import docker_client
|
||||
from compose.config.config import ServiceLoader
|
||||
from compose.const import LABEL_PROJECT
|
||||
from compose.cli.docker_client import docker_client
|
||||
from compose.progress_stream import stream_output
|
||||
from .. import unittest
|
||||
from compose.service import Service
|
||||
|
||||
|
||||
class DockerClientTestCase(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
|
||||
import mock
|
||||
from tests import unittest
|
||||
|
||||
from compose.cli import docker_client
|
||||
from tests import unittest
|
||||
|
||||
|
||||
class DockerClientTestCase(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
from tests import unittest
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from compose.cli import verbose_proxy
|
||||
from tests import unittest
|
||||
|
||||
|
||||
class VerboseProxyTestCase(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
from .. import unittest
|
||||
|
||||
import docker
|
||||
import mock
|
||||
|
||||
from .. import unittest
|
||||
from compose.cli.docopt_command import NoSuchCommand
|
||||
from compose.cli.errors import UserError
|
||||
from compose.cli.main import TopLevelCommand
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
import mock
|
||||
import os
|
||||
import shutil
|
||||
import tempfile
|
||||
from .. import unittest
|
||||
|
||||
import mock
|
||||
|
||||
from .. import unittest
|
||||
from compose.config import config
|
||||
from compose.config.errors import ConfigurationError
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
from __future__ import unicode_literals
|
||||
from .. import unittest
|
||||
|
||||
import mock
|
||||
import docker
|
||||
import mock
|
||||
|
||||
from .. import unittest
|
||||
from compose.container import Container
|
||||
from compose.container import get_container_name
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
import unittest
|
||||
|
||||
from compose.config.interpolation import interpolate, InvalidInterpolation
|
||||
from compose.config.interpolation import BlankDefaultDict as bddict
|
||||
from compose.config.interpolation import interpolate
|
||||
from compose.config.interpolation import InvalidInterpolation
|
||||
|
||||
|
||||
class InterpolationTest(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
|
||||
from compose.cli.log_printer import LogPrinter
|
||||
from .. import unittest
|
||||
from compose.cli.log_printer import LogPrinter
|
||||
|
||||
|
||||
class LogPrinterTest(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
from tests import unittest
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from six import StringIO
|
||||
|
||||
from compose import progress_stream
|
||||
from tests import unittest
|
||||
|
||||
|
||||
class ProgressStreamTestCase(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
from __future__ import unicode_literals
|
||||
from .. import unittest
|
||||
from compose.service import Service
|
||||
from compose.project import Project
|
||||
from compose.container import Container
|
||||
from compose.const import LABEL_SERVICE
|
||||
|
||||
import mock
|
||||
import docker
|
||||
import mock
|
||||
|
||||
from .. import unittest
|
||||
from compose.const import LABEL_SERVICE
|
||||
from compose.container import Container
|
||||
from compose.project import Project
|
||||
from compose.service import Service
|
||||
|
||||
|
||||
class ProjectTest(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,25 +1,24 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
|
||||
from .. import unittest
|
||||
import mock
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import docker
|
||||
import mock
|
||||
from docker.utils import LogConfig
|
||||
|
||||
from compose.service import Service
|
||||
from .. import unittest
|
||||
from compose.const import LABEL_ONE_OFF
|
||||
from compose.const import LABEL_PROJECT
|
||||
from compose.const import LABEL_SERVICE
|
||||
from compose.container import Container
|
||||
from compose.const import LABEL_SERVICE, LABEL_PROJECT, LABEL_ONE_OFF
|
||||
from compose.service import (
|
||||
ConfigError,
|
||||
NeedsBuildError,
|
||||
NoSuchImageError,
|
||||
build_volume_binding,
|
||||
get_container_data_volumes,
|
||||
merge_volume_bindings,
|
||||
parse_repository_tag,
|
||||
parse_volume_spec,
|
||||
)
|
||||
from compose.service import build_volume_binding
|
||||
from compose.service import ConfigError
|
||||
from compose.service import get_container_data_volumes
|
||||
from compose.service import merge_volume_bindings
|
||||
from compose.service import NeedsBuildError
|
||||
from compose.service import NoSuchImageError
|
||||
from compose.service import parse_repository_tag
|
||||
from compose.service import parse_volume_spec
|
||||
from compose.service import Service
|
||||
|
||||
|
||||
class ServiceTest(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
from compose.project import sort_service_dicts, DependencyError
|
||||
from .. import unittest
|
||||
from compose.project import DependencyError
|
||||
from compose.project import sort_service_dicts
|
||||
|
||||
|
||||
class SortServiceTest(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
from __future__ import unicode_literals
|
||||
from __future__ import absolute_import
|
||||
from compose.cli.utils import split_buffer
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from .. import unittest
|
||||
from compose.cli.utils import split_buffer
|
||||
|
||||
|
||||
class SplitBufferTest(unittest.TestCase):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue