Update some pre-commit hooks + some minor tweaks

tests/clientlib/validate_config_test.py

@@ -7,8 +7,8 @@ from pre_commit.clientlib.validate_config import InvalidConfigError
 from pre_commit.clientlib.validate_config import run
 from pre_commit.clientlib.validate_config import validate_config_extra
 from pre_commit.jsonschema_extensions import apply_defaults
-from testing.util import is_valid_according_to_schema
 from testing.util import get_resource_path
+from testing.util import is_valid_according_to_schema
 
 
 @pytest.mark.parametrize(

tests/clientlib/validate_manifest_test.py

@@ -6,8 +6,8 @@ from pre_commit.clientlib.validate_manifest import additional_manifest_check
 from pre_commit.clientlib.validate_manifest import InvalidManifestError
 from pre_commit.clientlib.validate_manifest import MANIFEST_JSON_SCHEMA
 from pre_commit.clientlib.validate_manifest import run
-from testing.util import is_valid_according_to_schema
 from testing.util import get_resource_path
+from testing.util import is_valid_according_to_schema
 
 
 @pytest.mark.parametrize(

tests/color_test.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
+import sys
+
 import mock
 import pytest
-import sys
 
 from pre_commit.color import format_color
 from pre_commit.color import GREEN

tests/commands/autoupdate_test.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
 
-import pytest
 import shutil
 
+import pytest
+
 import pre_commit.constants as C
 from pre_commit.commands.autoupdate import _update_repository
 from pre_commit.commands.autoupdate import autoupdate

tests/commands/install_uninstall_test.py

@@ -2,20 +2,21 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import io
-import mock
 import os
 import os.path
 import re
-import subprocess
 import stat
+import subprocess
 import sys
 
+import mock
+
 from pre_commit.commands.install_uninstall import IDENTIFYING_HASH
-from pre_commit.commands.install_uninstall import PREVIOUS_IDENTIFYING_HASHES
 from pre_commit.commands.install_uninstall import install
 from pre_commit.commands.install_uninstall import is_our_pre_commit
 from pre_commit.commands.install_uninstall import is_previous_pre_commit
 from pre_commit.commands.install_uninstall import make_executable
+from pre_commit.commands.install_uninstall import PREVIOUS_IDENTIFYING_HASHES
 from pre_commit.commands.install_uninstall import uninstall
 from pre_commit.runner import Runner
 from pre_commit.util import cmd_output

tests/commands/run_test.py

@@ -2,12 +2,13 @@
 from __future__ import unicode_literals
 
 import io
-import mock
 import os
 import os.path
-import pytest
 import subprocess
 
+import mock
+import pytest
+
 from pre_commit.commands.install_uninstall import install
 from pre_commit.commands.run import _get_skips
 from pre_commit.commands.run import _has_unmerged_paths

tests/conftest.py

@@ -2,9 +2,10 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import io
-import mock
 import os
 import os.path
+
+import mock
 import pytest
 
 import pre_commit.constants as C

tests/error_handler_test.py

@@ -3,9 +3,10 @@ from __future__ import unicode_literals
 
 import io
 import os.path
+import re
+
 import mock
 import pytest
-import re
 
 from pre_commit import error_handler
 from pre_commit.errors import FatalError

tests/git_test.py

@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import os.path
+
 import pytest
 
 from pre_commit import git

tests/languages/all_test.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import inspect
+
 import pytest
 
 from pre_commit.languages.all import all_languages

tests/main_test.py

@@ -2,6 +2,7 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import argparse
+
 import mock
 import pytest
 

tests/make_archives_test.py

@@ -1,8 +1,9 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-import mock
 import os.path
+
+import mock
 import pytest
 
 from pre_commit import make_archives

tests/prefixed_command_runner_test.py

@@ -1,9 +1,10 @@
 from __future__ import unicode_literals
 
 import os
+import subprocess
+
 import mock
 import pytest
-import subprocess
 
 from pre_commit.prefixed_command_runner import _replace_cmd
 from pre_commit.prefixed_command_runner import PrefixedCommandRunner

tests/repository_test.py

@@ -2,8 +2,9 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import io
-import mock
 import os.path
+
+import mock
 import pytest
 
 from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA

tests/staged_files_only_test.py

@@ -4,11 +4,12 @@ from __future__ import unicode_literals
 
 import io
 import logging
-import mock
 import os.path
-import pytest
 import shutil
 
+import mock
+import pytest
+
 from pre_commit.staged_files_only import staged_files_only
 from pre_commit.util import cmd_output
 from pre_commit.util import cwd

tests/store_test.py

@@ -2,12 +2,13 @@ from __future__ import absolute_import
 from __future__ import unicode_literals
 
 import io
-import mock
 import os
 import os.path
-import pytest
 import shutil
 
+import mock
+import pytest
+
 from pre_commit import five
 from pre_commit.store import _get_default_directory
 from pre_commit.store import logger

tests/util_test.py

@@ -1,10 +1,11 @@
 from __future__ import unicode_literals
 
-import pytest
 import os
 import os.path
 import random
 
+import pytest
+
 from pre_commit.util import clean_path_on_failure
 from pre_commit.util import cwd
 from pre_commit.util import memoize_by_cwd