瀏覽代碼

Update pre-commit config to enforace that future imports exist in all files.

Signed-off-by: Daniel Nephin <[email protected]>
Daniel Nephin 10 年之前
父節點
當前提交
475a091768

+ 6 - 1
.pre-commit-config.yaml

@@ -14,7 +14,12 @@
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 - repo: git://github.com/asottile/reorder_python_imports
-  sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10
+  sha: v0.1.0
   hooks:
     - id: reorder-python-imports
       language_version: 'python2.7'
+      args:
+        - --add-import
+        - from __future__ import absolute_import
+        - --add-import
+        - from __future__ import unicode_literals

+ 1 - 0
compose/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 __version__ = '1.6.0dev'

+ 1 - 0
compose/cli/colors.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 NAMES = [
     'grey',

+ 3 - 0
compose/cli/docker_client.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import logging
 import os
 

+ 1 - 0
compose/cli/errors.py

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

+ 1 - 0
compose/cli/main.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import print_function
 from __future__ import unicode_literals
 

+ 1 - 0
compose/cli/multiplexer.py

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

+ 3 - 0
compose/cli/verbose_proxy.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import functools
 import logging
 import pprint

+ 3 - 0
compose/config/__init__.py

@@ -1,4 +1,7 @@
 # flake8: noqa
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 from .config import ConfigurationError
 from .config import DOCKER_CONFIG_KEYS
 from .config import find

+ 1 - 0
compose/config/config.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import codecs
 import logging

+ 4 - 0
compose/config/errors.py

@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+
 class ConfigurationError(Exception):
     def __init__(self, msg):
         self.msg = msg

+ 3 - 0
compose/config/interpolation.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import logging
 import os
 from string import Template

+ 3 - 0
compose/config/validation.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import json
 import logging
 import os

+ 3 - 0
compose/const.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import os
 import sys
 

+ 3 - 0
compose/progress_stream.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 from compose import utils
 
 

+ 3 - 0
compose/utils.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import codecs
 import hashlib
 import json

+ 2 - 0
script/travis/render-bintray-config.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 from __future__ import print_function
+from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import datetime
 import os.path

+ 2 - 0
script/versions.py

@@ -21,7 +21,9 @@ For example, if the list of versions is:
 `default` would return `1.7.1` and
 `recent -n 3` would return `1.8.0-rc2 1.7.1 1.6.2`
 """
+from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import argparse
 import itertools

+ 3 - 0
tests/__init__.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import sys
 
 if sys.version_info >= (2, 7):

+ 1 - 0
tests/acceptance/cli_test.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import os
 import shlex

+ 1 - 0
tests/integration/project_test.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import random

+ 1 - 0
tests/integration/state_test.py

@@ -2,6 +2,7 @@
 Integration tests which cover state convergence (aka smart recreate) performed
 by `docker-compose up`.
 """
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import py

+ 1 - 0
tests/unit/cli/command_test.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import pytest
 from requests.exceptions import ConnectionError

+ 1 - 0
tests/unit/cli/main_test.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 
 import logging
 

+ 2 - 0
tests/unit/config/config_test.py

@@ -1,5 +1,7 @@
 # encoding: utf-8
+from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import os
 import shutil

+ 3 - 0
tests/unit/config/sort_services_test.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 from compose.config.errors import DependencyError
 from compose.config.sort_services import sort_service_dicts
 from compose.config.types import VolumeFromSpec

+ 1 - 0
tests/unit/container_test.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker

+ 3 - 0
tests/unit/interpolation_test.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import unittest
 
 from compose.config.interpolation import BlankDefaultDict as bddict

+ 3 - 0
tests/unit/multiplexer_test.py

@@ -1,3 +1,6 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 import unittest
 
 from compose.cli.multiplexer import Multiplexer

+ 1 - 0
tests/unit/project_test.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import docker

+ 1 - 0
tests/unit/utils_test.py

@@ -1,4 +1,5 @@
 # encoding: utf-8
+from __future__ import absolute_import
 from __future__ import unicode_literals
 
 from compose import utils