Skip to content

Commit

Permalink
Correct, reformat, sort imports
Browse files Browse the repository at this point in the history
Signed-off-by: lachmanfrantisek <[email protected]>
  • Loading branch information
lachmanfrantisek committed Apr 15, 2018
1 parent d25a336 commit 4424896
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion colin/checks/abstract/envs.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import re

from ..result import CheckResult
from .containers import ContainerCheck
from .images import ImageCheck
from ..result import CheckResult


class EnvCheck(ContainerCheck, ImageCheck):
Expand Down
4 changes: 2 additions & 2 deletions colin/checks/abstract/filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

from ...core.exceptions import ColinException
from ..result import CheckResult
from .containers import ContainerCheck
from .images import ImageCheck
from ..result import CheckResult
from ...core.exceptions import ColinException


class FileSystemCheck(ContainerCheck, ImageCheck):
Expand Down
6 changes: 3 additions & 3 deletions colin/checks/abstract/labels.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
from ..check_utils import get_labels_from_target, check_label
from .dockerfile import DockerfileCheck
from ..check_utils import check_label
from ..result import CheckResult
from .containers import ContainerCheck
from .dockerfile import DockerfileCheck
from .images import ImageCheck
from ..result import CheckResult


class LabelCheck(ContainerCheck, ImageCheck, DockerfileCheck):
Expand Down
2 changes: 1 addition & 1 deletion colin/checks/result.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from six import iteritems

from ..core.constant import REQUIRED, PASSED, FAILED, WARNING, OPTIONAL
from ..core.constant import FAILED, OPTIONAL, PASSED, REQUIRED, WARNING


class CheckResult(object):
Expand Down
6 changes: 3 additions & 3 deletions colin/cli/colin.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
from six import iteritems

from ..checks.abstract.abstract_check import AbstractCheck
from ..core.ruleset.ruleset import get_rulesets
from .default_group import DefaultGroup
from ..core.colin import get_checks, run
from ..core.constant import COLOURS, OUTPUT_CHARS
from ..core.exceptions import ColinException
from ..core.colin import run, get_checks
from ..core.ruleset.ruleset import get_rulesets
from ..version import __version__
from .default_group import DefaultGroup

logger = logging.getLogger(__name__)

Expand Down
1 change: 1 addition & 0 deletions colin/core/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#


class ColinException(Exception):
""" Generic exception when something goes wrong with colin. """

Expand Down
7 changes: 2 additions & 5 deletions colin/core/ruleset/ruleset.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@
import six
from six import iteritems

from ..constant import JSON, RULESET_DIRECTORY
from ..exceptions import ColinRulesetException
from ..constant import RULESET_DIRECTORY, JSON
from ..loader import load_check_implementation
from ...checks.abstract.containers import ContainerCheck
from ...checks.abstract.dockerfile import DockerfileCheck
from ...checks.abstract.images import ImageCheck
from ..target import TargetType
from ..target import is_compatible

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
import sys
import os
import sys

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os

from setuptools import setup, find_packages
from setuptools import find_packages, setup

BASE_PATH = os.path.dirname(__file__)

Expand Down
1 change: 1 addition & 0 deletions tests/integration/colin_tests.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import colin


def get_colin_test_image():
return colin.run("colin-test")

Expand Down
1 change: 0 additions & 1 deletion tests/test_image_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import pytest

from colin.core.target import ImageName


Expand Down

0 comments on commit 4424896

Please sign in to comment.