drop python 3.6 support

python 3.6 reached end of life on 2021-12-23

tests/clientlib_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 import re
 

tests/color_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 from unittest import mock
 

tests/commands/autoupdate_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import shlex
 from unittest import mock
 

tests/commands/clean_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 from unittest import mock
 

tests/commands/gc_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 import pre_commit.constants as C

tests/commands/hook_impl_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 import sys
 from unittest import mock

tests/commands/init_templatedir_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 from unittest import mock
 

tests/commands/install_uninstall_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import re
 

tests/commands/migrate_config_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pre_commit.constants as C
 from pre_commit.commands.migrate_config import migrate_config
 

tests/commands/run_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import shlex
 import sys

tests/commands/sample_config_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pre_commit.commands.sample_config import sample_config
 
 

tests/commands/try_repo_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import re
 import time

tests/conftest.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import functools
 import io
 import logging

tests/envcontext_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 from unittest import mock
 

tests/error_handler_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import stat
 import sys

tests/git_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 
 import pytest

tests/languages/conda_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from pre_commit import envcontext

tests/languages/docker_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import builtins
 import json
 import ntpath

tests/languages/golang_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from pre_commit.languages.golang import guess_go_dir

tests/languages/helpers_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import multiprocessing
 import os.path
 import sys

tests/languages/node_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import os
 import shutil

tests/languages/pygrep_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from pre_commit.languages import pygrep

tests/languages/python_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import sys
 from unittest import mock
@@ -47,16 +49,16 @@ def test_norm_version_of_default_is_sys_executable():
     assert python.norm_version('default') is None
 
 
-@pytest.mark.parametrize('v', ('python3.6', 'python3', 'python'))
+@pytest.mark.parametrize('v', ('python3.9', 'python3', 'python'))
 def test_sys_executable_matches(v):
-    with mock.patch.object(sys, 'version_info', (3, 6, 7)):
+    with mock.patch.object(sys, 'version_info', (3, 9, 10)):
         assert python._sys_executable_matches(v)
         assert python.norm_version(v) is None
 
 
 @pytest.mark.parametrize('v', ('notpython', 'python3.x'))
 def test_sys_executable_matches_does_not_match(v):
-    with mock.patch.object(sys, 'version_info', (3, 6, 7)):
+    with mock.patch.object(sys, 'version_info', (3, 9, 10)):
         assert not python._sys_executable_matches(v)
 
 
@@ -65,7 +67,7 @@ def test_sys_executable_matches_does_not_match(v):
         ('/usr/bin/python3', '/usr/bin/python3.7', 'python3'),
         ('/usr/bin/python', '/usr/bin/python3.7', 'python3.7'),
         ('/usr/bin/python', '/usr/bin/python', None),
-        ('/usr/bin/python3.6m', '/usr/bin/python3.6m', 'python3.6m'),
+        ('/usr/bin/python3.7m', '/usr/bin/python3.7m', 'python3.7m'),
         ('v/bin/python', 'v/bin/pypy', 'pypy'),
     ),
 )

tests/languages/r_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 
 import pytest

tests/languages/ruby_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import tarfile
 from unittest import mock

tests/logging_handler_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 
 from pre_commit import color

tests/main_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import argparse
 import os.path
 from unittest import mock

tests/meta_hooks/check_hooks_apply_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pre_commit.meta_hooks import check_hooks_apply
 from testing.fixtures import add_config_to_repo
 

tests/meta_hooks/check_useless_excludes_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pre_commit import git
 from pre_commit.meta_hooks import check_useless_excludes
 from pre_commit.util import cmd_output

tests/meta_hooks/identity_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pre_commit.meta_hooks import identity
 
 

tests/output_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import io
 
 from pre_commit import output

tests/parse_shebang_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import os.path
 import shutil

tests/prefix_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 
 import pytest

tests/repository_test.py

@@ -1,8 +1,9 @@
+from __future__ import annotations
+
 import os.path
 import shutil
 import sys
 from typing import Any
-from typing import Dict
 from unittest import mock
 
 import cfgv
@@ -897,7 +898,7 @@ def test_local_python_repo(store, local_python_config):
 
 
 def test_default_language_version(store, local_python_config):
-    config: Dict[str, Any] = {
+    config: dict[str, Any] = {
         'default_language_version': {'python': 'fake'},
         'default_stages': ['commit'],
         'repos': [local_python_config],
@@ -914,7 +915,7 @@ def test_default_language_version(store, local_python_config):
 
 
 def test_default_stages(store, local_python_config):
-    config: Dict[str, Any] = {
+    config: dict[str, Any] = {
         'default_language_version': {'python': C.DEFAULT},
         'default_stages': ['commit'],
         'repos': [local_python_config],

tests/staged_files_only_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import itertools
 import os.path
 import shutil

tests/store_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import sqlite3
 import stat

tests/util_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import stat
 import subprocess

tests/xargs_test.py

@@ -1,8 +1,9 @@
+from __future__ import annotations
+
 import concurrent.futures
 import os
 import sys
 import time
-from typing import Tuple
 from unittest import mock
 
 import pytest
@@ -178,7 +179,7 @@ def test_thread_mapper_concurrency_uses_regular_map():
 
 def test_xargs_propagate_kwargs_to_cmd():
     env = {'PRE_COMMIT_TEST_VAR': 'Pre commit is awesome'}
-    cmd: Tuple[str, ...] = ('bash', '-c', 'echo $PRE_COMMIT_TEST_VAR', '--')
+    cmd: tuple[str, ...] = ('bash', '-c', 'echo $PRE_COMMIT_TEST_VAR', '--')
     cmd = parse_shebang.normalize_cmd(cmd)
 
     ret, stdout = xargs.xargs(cmd, ('1',), env=env)