diff --git a/src/pycalver/cli.py b/src/pycalver/cli.py
index 0086d6f..8624a02 100755
--- a/src/pycalver/cli.py
+++ b/src/pycalver/cli.py
@@ -11,16 +11,16 @@ Provided subcommands: show, test, init, bump
 """
 import os
 import sys
-import click
-import logging
 import typing as typ
+import logging
 import subprocess as sp
 
+import click
+
 from . import vcs
 from . import config
-from . import version
 from . import rewrite
-
+from . import version
 
 _VERBOSE = 0
 
diff --git a/src/pycalver/config.py b/src/pycalver/config.py
index 1cf0ce6..97a7c16 100644
--- a/src/pycalver/config.py
+++ b/src/pycalver/config.py
@@ -6,14 +6,14 @@
 """Parse setup.cfg or pycalver.cfg files."""
 
 import os
+import typing as typ
+import logging
+import datetime as dt
+import configparser
+
 import six
 import toml
-import configparser
-import typing as typ
 import pathlib2 as pl
-import datetime as dt
-
-import logging
 
 from . import version
 
diff --git a/src/pycalver/parse.py b/src/pycalver/parse.py
index 491f15b..cb47b2a 100644
--- a/src/pycalver/parse.py
+++ b/src/pycalver/parse.py
@@ -5,8 +5,8 @@
 # SPDX-License-Identifier: MIT
 """Parse PyCalVer strings from files."""
 
-import logging
 import typing as typ
+import logging
 
 from . import patterns
 
diff --git a/src/pycalver/rewrite.py b/src/pycalver/rewrite.py
index fc60b82..437e4d6 100644
--- a/src/pycalver/rewrite.py
+++ b/src/pycalver/rewrite.py
@@ -7,9 +7,10 @@
 
 import io
 import glob
+import typing as typ
 import difflib
 import logging
-import typing as typ
+
 import pathlib2 as pl
 
 from . import parse
@@ -17,7 +18,6 @@ from . import config
 from . import version
 from . import patterns
 
-
 log = logging.getLogger("pycalver.rewrite")
 
 
@@ -123,7 +123,7 @@ def rfd_from_content(
 
 
 def _iter_file_paths(
-    file_patterns: config.PatternsByGlob
+    file_patterns: config.PatternsByGlob,
 ) -> typ.Iterable[typ.Tuple[pl.Path, config.Patterns]]:
     for globstr, pattern_strs in file_patterns.items():
         file_paths = glob.glob(globstr)
diff --git a/src/pycalver/vcs.py b/src/pycalver/vcs.py
index 5463c0a..1459fdc 100644
--- a/src/pycalver/vcs.py
+++ b/src/pycalver/vcs.py
@@ -15,12 +15,11 @@ mercurial, then the git terms are used. For example "fetch"
 """
 
 import os
+import typing as typ
 import logging
 import tempfile
-import typing as typ
 import subprocess as sp
 
-
 log = logging.getLogger("pycalver.vcs")
 
 
diff --git a/src/pycalver/version.py b/src/pycalver/version.py
index 84fe173..3212132 100644
--- a/src/pycalver/version.py
+++ b/src/pycalver/version.py
@@ -5,11 +5,12 @@
 # SPDX-License-Identifier: MIT
 """Functions related to version string manipulation."""
 
-import logging
-import pkg_resources
 import typing as typ
+import logging
 import datetime as dt
 
+import pkg_resources
+
 from . import lex_id
 from . import patterns
 
diff --git a/test/test_cli.py b/test/test_cli.py
index 1b7880b..39b8a8f 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -1,17 +1,15 @@
 import os
 import time
 import shutil
-import pathlib2 as pl
 import subprocess as sp
 
 import pytest
-
+import pathlib2 as pl
 from click.testing import CliRunner
 
+import pycalver.cli as cli
 import pycalver.config as config
 import pycalver.patterns as patterns
-import pycalver.cli as cli
-
 
 SETUP_CFG_FIXTURE = """
 [metadata]
diff --git a/test/test_config.py b/test/test_config.py
index 2e5e7b8..b0c8c94 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -4,7 +4,6 @@ from pycalver import config
 
 from . import util
 
-
 PYCALVER_TOML_FIXTURE_1 = """
 [pycalver]
 current_version = "v201808.0123-alpha"
diff --git a/test/test_lex_id.py b/test/test_lex_id.py
index 9198eb8..1ddd096 100644
--- a/test/test_lex_id.py
+++ b/test/test_lex_id.py
@@ -1,4 +1,5 @@
 import random
+
 from pycalver import lex_id
 
 
diff --git a/test/test_parse.py b/test/test_parse.py
index 0e3be41..6f60923 100644
--- a/test/test_parse.py
+++ b/test/test_parse.py
@@ -1,6 +1,5 @@
 from pycalver import parse
 
-
 SETUP_PY_FIXTURE = """
 # setup.py
 import setuptools
diff --git a/test/test_patterns.py b/test/test_patterns.py
index df51aa3..541bbfe 100644
--- a/test/test_patterns.py
+++ b/test/test_patterns.py
@@ -1,4 +1,5 @@
 import re
+
 import pytest
 
 from pycalver import patterns
diff --git a/test/test_rewrite.py b/test/test_rewrite.py
index 3b698f2..93ff358 100644
--- a/test/test_rewrite.py
+++ b/test/test_rewrite.py
@@ -6,7 +6,6 @@ from pycalver import version
 
 from . import util
 
-
 REWRITE_FIXTURE = """
 # SPDX-License-Identifier: MIT
 __version__ = "v201809.0002-beta"
diff --git a/test/util.py b/test/util.py
index 27c1b37..141160b 100644
--- a/test/util.py
+++ b/test/util.py
@@ -2,9 +2,10 @@ import os
 import shlex
 import shutil
 import tempfile
-import pathlib2 as pl
 import subprocess as sp
 
+import pathlib2 as pl
+
 
 class Shell:
     def __init__(self, cwd):