Sort imports using isort (#491)

* Sort imports using `isort`

* Couple of extras

* Even more

* Ok

Author: chrisrink10

.prospector.yaml

@@ -5,12 +5,18 @@ test-warnings: true
 doc-warnings: false
 
 ignore-paths:
+  - .git
+  - .hg
   - .cache
   - .mypy_cache
   - .pytest_cache
   - .tox
   - build
   - dist
+  - docs
+  - htmlcov
+  - junit
+  - pip-wheel-metadata
   - lispcore.py
   - tests
 

Makefile

@@ -19,7 +19,7 @@ docs:
 
 .PHONY: format
 format:
-	@pipenv run black .
+	@pipenv run sh -c 'isort -rc . && black .'
 
 
 lispcore.py:

Pipfile

@@ -13,6 +13,7 @@ sphinx-rtd-theme = "*"
 tox = "*"
 tox-pyenv = "*"
 twine = "*"
+isort = "*"
 
 [packages]
 astor = "*"

Pipfile.lock

@@ -15,5 +15,35 @@ exclude = '''
   | buck-out
   | build
   | dist
+  | docs
+  | htmlcov
+  | junit
+  | pip-wheel-metadata
 )/
-'''
+'''
+
+[tool.isort]
+known_first_party = 'basilisp'
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+line_length = 88
+combine_as_imports = true
+skip = [
+  '.env',
+  '.hg',
+  '.git',
+  '.mypy_cache',
+  '.pytest_cache',
+  '.tox',
+  '.venv',
+  'buck-out',
+  'build',
+  'dist',
+  'docs',
+  'lispcore.py',
+  'htmlcov',
+  'junit',
+  'pip-wheel-metadata',
+]

pyproject.toml

@@ -55,11 +55,11 @@
     Is,
     IsNot,
     JoinedStr,
-    LShift,
     Lambda,
     List,
     ListComp,
     Load,
+    LShift,
     Lt,
     LtE,
     MatMult,
@@ -79,9 +79,9 @@
     Param,
     Pass,
     Pow,
-    RShift,
     Raise,
     Return,
+    RShift,
     Set,
     SetComp,
     Slice,
@@ -94,8 +94,8 @@
     Try,
     Tuple,
     UAdd,
-    USub,
     UnaryOp,
+    USub,
     While,
     With,
     Yield,

src/basilisp/_pyast.py

@@ -219,7 +219,7 @@ def get_filename(self, fullname: str) -> str:  # pragma: no cover
         return spec.loader_state.filename
 
     def create_module(self, spec: ModuleSpec):
-        logger.debug(f"Creating Basilisp module '{spec.name}''")
+        logger.debug(f"Creating Basilisp module '{spec.name}'")
         mod = BasilispModule(spec.name)
         mod.__file__ = spec.loader_state["filename"]
         mod.__loader__ = spec.loader

src/basilisp/importer.py

@@ -8,20 +8,20 @@
 import basilisp._pyast as ast
 import basilisp.lang.runtime as runtime
 from basilisp.lang.compiler.analyzer import (  # noqa
-    AnalyzerContext,
     WARN_ON_SHADOWED_NAME,
     WARN_ON_SHADOWED_VAR,
     WARN_ON_UNUSED_NAMES,
+    AnalyzerContext,
     analyze_form,
     macroexpand,
     macroexpand_1,
 )
 from basilisp.lang.compiler.exception import CompilerException, CompilerPhase  # noqa
 from basilisp.lang.compiler.generator import (  # noqa
-    GeneratedPyAST,
-    GeneratorContext,
     USE_VAR_INDIRECTION,
     WARN_ON_VAR_INDIRECTION,
+    GeneratedPyAST,
+    GeneratorContext,
     expressionize as _expressionize,
     gen_py_ast,
     py_module_preamble,

src/basilisp/lang/compiler/__init__.py

@@ -1,6 +1,6 @@
 import contextlib
 import time
-from typing import Optional, Callable, TypeVar, Generic
+from typing import Callable, Generic, Optional, TypeVar
 
 from functional import seq
 from functional.pipeline import Sequence

src/basilisp/util.py

@@ -30,7 +30,7 @@ def setup_module():
     runtime.print_generated_python = orig
 
 
-import basilisp.core as core
+import basilisp.core as core  # isort:skip
 
 TRUTHY_VALUES = [
     True,