refactor: apply isort on wily codebase

Makefile

@@ -26,8 +26,7 @@ lint_python:
 .PHONY: lint_formatting
 lint_formatting:
  black --check .
- @# TODO(skarzi): apply `isort` on codebase and require it to pass
- isort --check-only . || true
+ isort --check-only .
 
 .PHONY: lint_spelling
 lint_spelling:

docs/source/conf.py

@@ -12,8 +12,8 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 
-import sys
 import os.path
+import sys
 
 sys.path.insert(0, os.path.abspath("../"))
 

src/wily/__init__.py

@@ -36,10 +36,11 @@
  %%$%$&&S#&$$@@@@@@@@@$$@&&&@$@@@@@@@@@@@@@@@@$$%%$$
  .%%$$$$%%%$%%%%***%%%%%$%%$$$$$%%$%*&
 """
+import datetime
+import logging
 import tempfile
+
 import colorlog
-import logging
-import datetime
 
 __version__ = "1.23.0"
 

src/wily/__main__.py

@@ -1,17 +1,18 @@
 """Main command line."""
 
-import click
 import traceback
 from pathlib import Path
 
-from wily import logger, __version__, WILY_LOG_NAME
+import click
+
+from wily import WILY_LOG_NAME, __version__, logger
 from wily.archivers import resolve_archiver
 from wily.cache import exists, get_default_metrics
 from wily.config import DEFAULT_CONFIG_PATH, DEFAULT_GRID_STYLE
 from wily.config import load as load_config
 from wily.helper.custom_enums import ReportFormat
-from wily.operators import resolve_operators
 from wily.lang import _
+from wily.operators import resolve_operators
 
 version_text = _("Version: ") + __version__ + "\n\n"
 help_header = version_text + _(

src/wily/archivers/__init__.py

@@ -72,9 +72,8 @@ def find(self, search: str) -> Revision:
  raise NotImplementedError
 
 
-from wily.archivers.git import GitArchiver
 from wily.archivers.filesystem import FilesystemArchiver
-
+from wily.archivers.git import GitArchiver
 
 """Type for an operator"""
 Archiver = namedtuple("Archiver", "name cls description")

src/wily/archivers/filesystem.py

@@ -3,11 +3,11 @@
 
 Implementation of the archiver API for a standard directory (no revisions)
 """
+import hashlib
 import logging
+import os.path
 from typing import List
 
-import os.path
-import hashlib
 from wily.archivers import BaseArchiver, Revision
 
 logger = logging.getLogger(__name__)

src/wily/archivers/git.py

@@ -4,11 +4,11 @@
 Implementation of the archiver API for the gitpython module.
 """
 import logging
-from typing import Dict, Tuple, List
+from typing import Dict, List, Tuple
 
+import git.exc
 from git import Commit
 from git.repo import Repo
-import git.exc
 
 from wily.archivers import BaseArchiver, Revision
 

src/wily/cache.py

@@ -11,10 +11,10 @@
 import pathlib
 import shutil
 
-from wily import logger, __version__
+from wily import __version__, logger
 from wily.archivers import ALL_ARCHIVERS
-from wily.operators import resolve_operator
 from wily.lang import _
+from wily.operators import resolve_operator
 
 
 def exists(config):

src/wily/commands/build.py

@@ -4,18 +4,17 @@
 TODO : Convert .gitignore to radon ignore patterns to make the build more efficient.
 
 """
+import multiprocessing
 import os
 import pathlib
-import multiprocessing
+
 from progress.bar import Bar
 
 from wily import logger
-from wily.state import State
-
-from wily.archivers.git import InvalidGitRepositoryError
 from wily.archivers import FilesystemArchiver
-
+from wily.archivers.git import InvalidGitRepositoryError
 from wily.operators import resolve_operator
+from wily.state import State
 
 
 def run_operator(operator, revision, config, targets):

src/wily/commands/diff.py

@@ -5,25 +5,25 @@
 """
 import multiprocessing
 import os
+from pathlib import Path
+
+import radon.cli.harvest
 import tabulate
 
-from pathlib import Path
-from wily import logger, format_revision, format_date
+from wily import format_date, format_revision, logger
 from wily.archivers import resolve_archiver
+from wily.commands.build import run_operator
 from wily.config import DEFAULT_GRID_STYLE, DEFAULT_PATH
 from wily.operators import (
- resolve_metric,
- resolve_operator,
- get_metric,
- GOOD_COLORS,
  BAD_COLORS,
+ GOOD_COLORS,
  OperatorLevel,
+ get_metric,
+ resolve_metric,
+ resolve_operator,
 )
-from wily.commands.build import run_operator
 from wily.state import State
 
-import radon.cli.harvest
-
 
 def diff(config, files, metrics, changes_only=True, detail=True, revision=None):
  """

src/wily/commands/graph.py

@@ -8,7 +8,7 @@
 import plotly.graph_objs as go
 import plotly.offline
 
-from wily import logger, format_datetime
+from wily import format_datetime, logger
 from wily.operators import resolve_metric, resolve_metric_as_tuple
 from wily.state import State
 

src/wily/commands/index.py

@@ -5,7 +5,7 @@
 """
 import tabulate
 
-from wily import logger, format_date, format_revision, MAX_MESSAGE_WIDTH
+from wily import MAX_MESSAGE_WIDTH, format_date, format_revision, logger
 from wily.config import DEFAULT_GRID_STYLE
 from wily.state import State
 

src/wily/commands/rank.py

@@ -7,19 +7,18 @@
 
 TODO: Layer on Click invocation in operators section, __main__.py file
 """
+import operator as op
 import os
+from pathlib import Path
 
+import radon.cli.harvest
 import tabulate
-import operator as op
-from pathlib import Path
 
-from wily import logger, format_revision, format_date
+from wily import format_date, format_revision, logger
 from wily.archivers import resolve_archiver
 from wily.config import DEFAULT_GRID_STYLE, DEFAULT_PATH
+from wily.operators import MetricType, resolve_metric_as_tuple
 from wily.state import State
-from wily.operators import resolve_metric_as_tuple, MetricType
-
-import radon.cli.harvest
 
 
 def rank(config, path, metric, revision_index, limit, threshold, descending):

src/wily/commands/report.py

@@ -4,18 +4,18 @@
 The report command gives a table of metrics for a specified list of files.
 Will compare the values between revisions and highlight changes in green/red.
 """
-import tabulate
-
 from pathlib import Path
 from shutil import copytree
 from string import Template
 from typing import List
 
-from wily import logger, format_date, format_revision, MAX_MESSAGE_WIDTH
+import tabulate
+
+from wily import MAX_MESSAGE_WIDTH, format_date, format_revision, logger
 from wily.helper.custom_enums import ReportFormat
-from wily.operators import resolve_metric_as_tuple, MetricType
-from wily.state import State
 from wily.lang import _
+from wily.operators import MetricType, resolve_metric_as_tuple
+from wily.state import State
 
 ANSI_RED = 31
 ANSI_GREEN = 32

src/wily/config.py

@@ -5,12 +5,12 @@
 TODO : Better utilise default values and factory in @dataclass to replace DEFAULT_CONFIG
  and replace the logic in load() to set default values.
 """
-from functools import lru_cache
 import configparser
+import hashlib
 import logging
 import pathlib
-import hashlib
-from dataclasses import dataclass, field, InitVar
+from dataclasses import InitVar, dataclass, field
+from functools import lru_cache
 from typing import Any, List
 
 import wily.operators as operators

src/wily/operators/__init__.py

@@ -3,7 +3,8 @@
 from collections import namedtuple
 from enum import Enum
 from functools import lru_cache
-from typing import List, Dict, Any, Iterable, Union
+from typing import Any, Dict, Iterable, List, Union
+
 from wily.lang import _
 
 
@@ -72,10 +73,9 @@ def run(self, module: str, options: Dict[str, Any]) -> Dict[Any, Any]:
 
 
 from wily.operators.cyclomatic import CyclomaticComplexityOperator
+from wily.operators.halstead import HalsteadOperator
 from wily.operators.maintainability import MaintainabilityIndexOperator
 from wily.operators.raw import RawMetricsOperator
-from wily.operators.halstead import HalsteadOperator
-
 
 """Type for an operator."""
 Operator = namedtuple("Operator", "name cls description level")

src/wily/operators/cyclomatic.py

@@ -8,11 +8,11 @@
 import radon
 import radon.cli.harvest as harvesters
 from radon.cli import Config
-from radon.visitors import Function, Class
+from radon.visitors import Class, Function
 
 from wily import logger
-from wily.operators import BaseOperator, Metric, MetricType
 from wily.lang import _
+from wily.operators import BaseOperator, Metric, MetricType
 
 
 class CyclomaticComplexityOperator(BaseOperator):

src/wily/operators/halstead.py

@@ -7,8 +7,8 @@
 from radon.cli import Config
 
 from wily import logger
-from wily.operators import BaseOperator, MetricType, Metric
 from wily.lang import _
+from wily.operators import BaseOperator, Metric, MetricType
 
 
 class HalsteadOperator(BaseOperator):

src/wily/operators/maintainability.py

@@ -10,8 +10,8 @@
 from radon.cli import Config
 
 from wily import logger
-from wily.operators import BaseOperator, MetricType, Metric
 from wily.lang import _
+from wily.operators import BaseOperator, Metric, MetricType
 
 
 def mode(data):

src/wily/operators/raw.py

@@ -7,7 +7,7 @@
 from radon.cli import Config
 
 from wily import logger
-from wily.operators import BaseOperator, MetricType, Metric
+from wily.operators import BaseOperator, Metric, MetricType
 
 
 class RawMetricsOperator(BaseOperator):

src/wily/state.py

@@ -4,7 +4,7 @@
 Contains a lazy revision, index and process state model.
 """
 from collections import OrderedDict
-from dataclasses import dataclass, asdict
+from dataclasses import asdict, dataclass
 from typing import List
 
 import wily.cache as cache

test/conftest.py

@@ -1,12 +1,12 @@
 import pathlib
-from textwrap import dedent
 import shutil
 import tempfile
+from textwrap import dedent
 from time import time
 
 import pytest
 from click.testing import CliRunner
-from git import Repo, Actor
+from git import Actor, Repo
 
 import wily.__main__ as main
 

test/integration/test_all_operators.py

@@ -3,13 +3,13 @@
 
 Build them and test out some of the metrics/commands work correctly.
 """
-import pytest
-import sys
-from click.testing import CliRunner
 import pathlib
+import sys
 from textwrap import dedent
 
-from git import Repo, Actor
+import pytest
+from click.testing import CliRunner
+from git import Actor, Repo
 
 import wily.__main__ as main
 

test/integration/test_archiver.py

@@ -1,9 +1,9 @@
 import pathlib
 
 import pytest
-from git import Repo, Actor
+from git import Actor, Repo
 
-from wily.archivers.git import GitArchiver, DirtyGitRepositoryError
+from wily.archivers.git import DirtyGitRepositoryError, GitArchiver
 from wily.config import DEFAULT_CONFIG
 
 

test/integration/test_build.py

@@ -6,12 +6,13 @@
 
 TODO : Test build + build with extra operator
 """
-import sys
 import pathlib
+import sys
+from unittest.mock import patch
+
 import pytest
 from click.testing import CliRunner
-from git import Repo, Actor
-from unittest.mock import patch
+from git import Actor, Repo
 
 import wily.__main__ as main
 from wily.archivers import ALL_ARCHIVERS