Run pre-commit on all files

Signed-off-by: Daniel Nephin <dnephin@gmail.com>

CHANGELOG.md

@@ -410,5 +410,3 @@ Big thanks to @tomstuart, @EnTeQuAk, @schickling, @aronasorman and @GeoffreyPlit
 ------------------
 
 Initial release.
-
-

compose/cli/command.py

@@ -1,20 +1,25 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from requests.exceptions import ConnectionError, SSLError
+from __future__ import unicode_literals
+
 import logging
 import os
 import re
-import six
 
+import six
+from requests.exceptions import ConnectionError
+from requests.exceptions import SSLError
+
+from . import errors
+from . import verbose_proxy
+from .. import __version__
 from .. import config
 from ..project import Project
 from ..service import ConfigError
-from .docopt_command import DocoptCommand
-from .utils import call_silently, is_mac, is_ubuntu
 from .docker_client import docker_client
-from . import verbose_proxy
+from .docopt_command import DocoptCommand
-from . import errors
+from .utils import call_silently
-from .. import __version__
+from .utils import is_mac
+from .utils import is_ubuntu
 
 log = logging.getLogger(__name__)
 

compose/cli/docker_client.py

@@ -1,7 +1,8 @@
+import os
+import ssl
+
 from docker import Client
 from docker import tls
-import ssl
-import os
 
 
 def docker_client():

compose/cli/docopt_command.py

@@ -1,9 +1,11 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-import sys
+from __future__ import unicode_literals
 
+import sys
 from inspect import getdoc
-from docopt import docopt, DocoptExit
+
+from docopt import docopt
+from docopt import DocoptExit
 
 
 def docopt_full_help(docstring, *args, **kwargs):

compose/cli/errors.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+
 from textwrap import dedent
 
 

compose/cli/formatter.py

@@ -1,6 +1,8 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import os
+
 import texttable
 
 

compose/cli/log_printer.py

@@ -1,11 +1,11 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-import sys
+from __future__ import unicode_literals
 
+import sys
 from itertools import cycle
 
-from .multiplexer import Multiplexer
 from . import colors
+from .multiplexer import Multiplexer
 from .utils import split_buffer
 
 

compose/cli/main.py

@@ -1,28 +1,32 @@
 from __future__ import print_function
 from __future__ import unicode_literals
-from inspect import getdoc
+
-from operator import attrgetter
 import logging
 import re
 import signal
 import sys
+from inspect import getdoc
+from operator import attrgetter
 
-from docker.errors import APIError
 import dockerpty
+from docker.errors import APIError
 
 from .. import __version__
 from .. import legacy
-from ..const import DEFAULT_TIMEOUT
-from ..project import NoSuchService, ConfigurationError
-from ..service import BuildError, NeedsBuildError
 from ..config import parse_environment
+from ..const import DEFAULT_TIMEOUT
 from ..progress_stream import StreamOutputError
+from ..project import ConfigurationError
+from ..project import NoSuchService
+from ..service import BuildError
+from ..service import NeedsBuildError
 from .command import Command
 from .docopt_command import NoSuchCommand
 from .errors import UserError
 from .formatter import Formatter
 from .log_printer import LogPrinter
-from .utils import yesno, get_version_info
+from .utils import get_version_info
+from .utils import yesno
 
 log = logging.getLogger(__name__)
 console_handler = logging.StreamHandler(sys.stderr)

compose/cli/multiplexer.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+
 from threading import Thread
 
 try:

compose/cli/utils.py

@@ -1,14 +1,16 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import unicode_literals
 
-from .. import __version__
 import datetime
-from docker import version as docker_py_version
 import os
 import platform
-import subprocess
 import ssl
+import subprocess
+
+from docker import version as docker_py_version
+
+from .. import __version__
 
 
 def yesno(prompt, default=None):

compose/cli/verbose_proxy.py

@@ -1,8 +1,7 @@
-
 import functools
-from itertools import chain
 import logging
 import pprint
+from itertools import chain
 
 import six
 

compose/config/__init__.py

@@ -1,10 +1,9 @@
-from .config import (
+# flake8: noqa
-    DOCKER_CONFIG_KEYS,
+from .config import ConfigDetails
-    ConfigDetails,
+from .config import ConfigurationError
-    ConfigurationError,
+from .config import DOCKER_CONFIG_KEYS
-    find,
+from .config import find
-    load,
+from .config import get_service_name_from_net
-    parse_environment,
+from .config import load
-    merge_environment,
+from .config import merge_environment
-    get_service_name_from_net,
+from .config import parse_environment
-)  # flake8: noqa

compose/config/config.py

@@ -1,23 +1,19 @@
 import logging
 import os
 import sys
-import yaml
 from collections import namedtuple
+
 import six
+import yaml
 
-from compose.cli.utils import find_candidates_in_parent_dirs
+from .errors import CircularReference
-
+from .errors import ComposeFileNotFound
+from .errors import ConfigurationError
 from .interpolation import interpolate_environment_variables
-from .errors import (
+from .validation import validate_against_schema
-    ConfigurationError,
+from .validation import validate_service_names
-    CircularReference,
+from .validation import validate_top_level_object
-    ComposeFileNotFound,
+from compose.cli.utils import find_candidates_in_parent_dirs
-)
-from .validation import (
-    validate_against_schema,
-    validate_service_names,
-    validate_top_level_object
-)
 
 
 DOCKER_CONFIG_KEYS = [

compose/config/interpolation.py

@@ -1,11 +1,10 @@
+import logging
 import os
 from string import Template
 
 import six
 
 from .errors import ConfigurationError
-
-import logging
 log = logging.getLogger(__name__)
 
 

compose/config/validation.py

@@ -1,9 +1,11 @@
-from functools import wraps
+import json
 import os
+from functools import wraps
 
 from docker.utils.ports import split_port
-import json
+from jsonschema import Draft4Validator
-from jsonschema import Draft4Validator, FormatChecker, ValidationError
+from jsonschema import FormatChecker
+from jsonschema import ValidationError
 
 from .errors import ConfigurationError
 

compose/container.py

@@ -1,10 +1,12 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
-import six
 from functools import reduce
 
-from .const import LABEL_CONTAINER_NUMBER, LABEL_SERVICE
+import six
+
+from .const import LABEL_CONTAINER_NUMBER
+from .const import LABEL_SERVICE
 
 
 class Container(object):

compose/legacy.py

@@ -2,7 +2,8 @@ import logging
 import re
 
 from .const import LABEL_VERSION
-from .container import get_container_name, Container
+from .container import Container
+from .container import get_container_name
 
 
 log = logging.getLogger(__name__)

compose/progress_stream.py

@@ -1,6 +1,6 @@
+import codecs
 import json
 import os
-import codecs
 
 
 class StreamOutputError(Exception):

compose/project.py

@@ -1,12 +1,17 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from functools import reduce
+from __future__ import unicode_literals
+
 import logging
+from functools import reduce
 
 from docker.errors import APIError
 
-from .config import get_service_name_from_net, ConfigurationError
+from .config import ConfigurationError
-from .const import DEFAULT_TIMEOUT, LABEL_PROJECT, LABEL_SERVICE, LABEL_ONE_OFF
+from .config import get_service_name_from_net
+from .const import DEFAULT_TIMEOUT
+from .const import LABEL_ONE_OFF
+from .const import LABEL_PROJECT
+from .const import LABEL_SERVICE
 from .container import Container
 from .legacy import check_for_legacy_containers
 from .service import Service

compose/service.py

@@ -1,33 +1,37 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from collections import namedtuple
+from __future__ import unicode_literals
+
 import logging
-import re
 import os
+import re
 import sys
+from collections import namedtuple
 from operator import attrgetter
 
 import six
 from docker.errors import APIError
-from docker.utils import create_host_config, LogConfig
+from docker.utils import create_host_config
-from docker.utils.ports import build_port_bindings, split_port
+from docker.utils import LogConfig
+from docker.utils.ports import build_port_bindings
+from docker.utils.ports import split_port
 
 from . import __version__
-from .config import DOCKER_CONFIG_KEYS, merge_environment
+from .config import DOCKER_CONFIG_KEYS
-from .const import (
+from .config import merge_environment
-    DEFAULT_TIMEOUT,
+from .config.validation import VALID_NAME_CHARS
-    LABEL_CONTAINER_NUMBER,
+from .const import DEFAULT_TIMEOUT
-    LABEL_ONE_OFF,
+from .const import LABEL_CONFIG_HASH
-    LABEL_PROJECT,
+from .const import LABEL_CONTAINER_NUMBER
-    LABEL_SERVICE,
+from .const import LABEL_ONE_OFF
-    LABEL_VERSION,
+from .const import LABEL_PROJECT
-    LABEL_CONFIG_HASH,
+from .const import LABEL_SERVICE
-)
+from .const import LABEL_VERSION
 from .container import Container
 from .legacy import check_for_legacy_containers
-from .progress_stream import stream_output, StreamOutputError
+from .progress_stream import stream_output
-from .utils import json_hash, parallel_execute
+from .progress_stream import StreamOutputError
-from .config.validation import VALID_NAME_CHARS
+from .utils import json_hash
+from .utils import parallel_execute
 
 log = logging.getLogger(__name__)
 

compose/utils.py

@@ -3,10 +3,11 @@ import hashlib
 import json
 import logging
 import sys
+from Queue import Empty
+from Queue import Queue
+from threading import Thread
 
 from docker.errors import APIError
-from Queue import Queue, Empty
-from threading import Thread
 
 
 log = logging.getLogger(__name__)

docs/pre-process.sh

@@ -58,4 +58,3 @@ do
 done
 
 rm -rf /docs/content/docker
-

docs/production.md

@@ -93,4 +93,3 @@ guide</a>.
 - [Yaml file reference](yml.md)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
-

docs/reference/run.md

@@ -52,7 +52,3 @@ This would open up an interactive PostgreSQL shell for the linked `db` container
 If you do not want the `run` command to start linked containers, specify the `--no-deps` flag:
 
     $ docker-compose run --no-deps web python manage.py shell
-
-
-
-

docs/yml.md

@@ -433,4 +433,3 @@ dollar sign (`$$`).
 - [Command line reference](/reference)
 - [Compose environment variables](env.md)
 - [Compose command line completion](completion.md)
-

requirements-dev.txt

@@ -1,7 +1,7 @@
+coverage==3.7.1
+flake8==2.3.0
+git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
 mock >= 1.0.1
 nose==1.3.4
-git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c873ddaae056#egg=pyinstaller
-unittest2==0.8.0
-flake8==2.3.0
 pep8==1.6.1
-coverage==3.7.1
+unittest2==0.8.0

requirements.txt

@@ -1,8 +1,8 @@
 PyYAML==3.10
-jsonschema==2.5.1
 docker-py==1.3.1
 dockerpty==0.3.4
 docopt==0.6.1
+jsonschema==2.5.1
 requests==2.6.1
 six==1.7.3
 texttable==0.8.2

setup.py

@@ -1,13 +1,16 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 from __future__ import absolute_import
-from setuptools import setup, find_packages
+from __future__ import unicode_literals
+
 import codecs
 import os
 import re
 import sys
 
+from setuptools import find_packages
+from setuptools import setup
+
 
 def read(*parts):
     path = os.path.join(os.path.dirname(__file__), *parts)

tests/integration/cli_test.py

@@ -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
 
 

tests/integration/legacy_test.py

@@ -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):

tests/integration/project_test.py

@@ -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):

tests/integration/resilience_test.py

@@ -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):

tests/integration/service_test.py

@@ -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
+from six import StringIO
-import shutil
+from six import text_type
-from six import StringIO, 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):

tests/integration/state_test.py

@@ -1,13 +1,13 @@
 from __future__ import unicode_literals
-import tempfile
-import shutil
-import os
 
-from compose import config
+import os
-from compose.project import Project
+import shutil
-from compose.const import LABEL_CONFIG_HASH
+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):

tests/integration/testcases.py

@@ -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):

tests/unit/cli/docker_client_test.py

@@ -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):

tests/unit/cli/verbose_proxy_test.py

@@ -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):

tests/unit/cli_test.py

@@ -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

tests/unit/config_test.py

@@ -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
 

tests/unit/container_test.py

@@ -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
 

tests/unit/interpolation_test.py

@@ -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):

tests/unit/log_printer_test.py

@@ -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):

tests/unit/progress_stream_test.py

@@ -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):

tests/unit/project_test.py

@@ -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):

tests/unit/service_test.py

@@ -1,25 +1,24 @@
-from __future__ import unicode_literals
 from __future__ import absolute_import
-
+from __future__ import unicode_literals
-from .. import unittest
-import mock
 
 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 build_volume_binding
-from compose.service import (
+from compose.service import ConfigError
-    ConfigError,
+from compose.service import get_container_data_volumes
-    NeedsBuildError,
+from compose.service import merge_volume_bindings
-    NoSuchImageError,
+from compose.service import NeedsBuildError
-    build_volume_binding,
+from compose.service import NoSuchImageError
-    get_container_data_volumes,
+from compose.service import parse_repository_tag
-    merge_volume_bindings,
+from compose.service import parse_volume_spec
-    parse_repository_tag,
+from compose.service import Service
-    parse_volume_spec,
-)
 
 
 class ServiceTest(unittest.TestCase):

tests/unit/sort_service_test.py

@@ -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):

tests/unit/split_buffer_test.py

@@ -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):