Drop python 3.6 support (#2275)

Author: gaborbernat

.github/workflows/check.yml

@@ -28,7 +28,6 @@ jobs:
           - "3.9.9"
           - "3.8"
           - "3.7"
-          - "3.6"
         os:
           - Ubuntu
           - Windows

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
     rev: v2.29.1
     hooks:
       - id: pyupgrade
-        args: ["--py36-plus"]
+        args: ["--py37-plus"]
         exclude: "^(tests/demo_pkg_inline/build.py)$"
       - id: pyupgrade
         files: "^(tests/demo_pkg_inline/build.py)$"

docs/changelog/2275.feature.rst

@@ -0,0 +1 @@
+Drop python 3.6 support - by :user:`gaborbernat`.

setup.cfg

@@ -21,7 +21,6 @@ classifiers =
     Operating System :: POSIX
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -48,7 +47,7 @@ install_requires =
     virtualenv>=20.6
     importlib-metadata>=4.6.1;python_version<"3.8"
     typing-extensions>=3.10;python_version<"3.8"
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir =
     =src
 
@@ -122,23 +121,9 @@ skip_covered = false
 subtract_omit = */.tox/*
 
 [mypy]
-python_version = 3.6
-disallow_any_generics = True
-disallow_subclassing_any = True
-disallow_untyped_calls = True
-disallow_untyped_defs = True
-disallow_incomplete_defs = True
-disallow_untyped_decorators = True
-show_error_codes = True
-no_implicit_optional = True
-warn_redundant_casts = True
-warn_unused_ignores = False
-warn_no_return = True
-warn_return_any = True
-implicit_reexport = False
-strict_equality = True
-warn_unused_configs = True
-pretty = True
+python_version = 3.7
+strict = true
+show_error_codes = true
 
 [mypy-colorama.*]
 ignore_missing_imports = True

setup.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from setuptools import setup
 
 setup()

src/tox/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from .run import main
 from .version import version as __version__
 

src/tox/__main__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from tox.run import run
 
 if __name__ == "__main__":

src/tox/config/cli/env_var.py

@@ -1,16 +1,18 @@
 """
 Provides configuration values from the environment variables.
 """
+from __future__ import annotations
+
 import logging
 import os
-from typing import Any, Optional, Tuple, Type
+from typing import Any
 
 from tox.config.loader.str_convert import StrConvert
 
 CONVERT = StrConvert()
 
 
-def get_env_var(key: str, of_type: Type[Any]) -> Optional[Tuple[Any, str]]:
+def get_env_var(key: str, of_type: type[Any]) -> tuple[Any, str] | None:
     """Get the environment variable option.
 
     :param key: the config key requested

src/tox/config/cli/ini.py

@@ -1,11 +1,13 @@
 """
 Provides configuration values from tox.ini files.
 """
+from __future__ import annotations
+
 import logging
 import os
 from configparser import ConfigParser
 from pathlib import Path
-from typing import Any, Dict, Optional, Tuple, Type
+from typing import Any
 
 from platformdirs import user_config_dir
 
@@ -24,9 +26,9 @@ def __init__(self) -> None:
         config_file = os.environ.get(self.TOX_CONFIG_FILE_ENV_VAR, None)
         self.is_env_var = config_file is not None
         self.config_file = Path(config_file if config_file is not None else DEFAULT_CONFIG_FILE)
-        self._cache: Dict[Tuple[str, Type[Any]], Any] = {}
-        self.has_config_file: Optional[bool] = self.config_file.exists()
-        self.ini: Optional[IniLoader] = None
+        self._cache: dict[tuple[str, type[Any]], Any] = {}
+        self.has_config_file: bool | None = self.config_file.exists()
+        self.ini: IniLoader | None = None
 
         if self.has_config_file:
             self.config_file = self.config_file.absolute()
@@ -42,7 +44,7 @@ def __init__(self) -> None:
                 logging.error("failed to read config file %s because %r", config_file, exception)
                 self.has_config_file = None
 
-    def get(self, key: str, of_type: Type[Any]) -> Any:
+    def get(self, key: str, of_type: type[Any]) -> Any:
         cache_key = key, of_type
         if cache_key in self._cache:
             result = self._cache[cache_key]

src/tox/config/cli/parse.py

@@ -1,8 +1,9 @@
 """
 This module pulls together this package: create and parse CLI arguments for tox.
 """
+from __future__ import annotations
 
-from typing import Dict, Optional, Sequence, Tuple, cast
+from typing import Dict, Sequence, cast
 
 from tox.config.source import Source, discover_source
 from tox.report import ToxHandler, setup_report
@@ -12,8 +13,8 @@
 Handlers = Dict[str, Handler]
 
 
-def get_options(*args: str) -> Tuple[Parsed, Handlers, Optional[Sequence[str]], ToxHandler, Source]:
-    pos_args: Optional[Tuple[str, ...]] = None
+def get_options(*args: str) -> tuple[Parsed, Handlers, Sequence[str] | None, ToxHandler, Source]:
+    pos_args: tuple[str, ...] | None = None
     try:  # remove positional arguments passed to parser if specified, they are pulled directly from sys.argv
         pos_arg_at = args.index("--")
     except ValueError:
@@ -29,7 +30,7 @@ def get_options(*args: str) -> Tuple[Parsed, Handlers, Optional[Sequence[str]],
     return parsed, cmd_handlers, pos_args, log_handler, source
 
 
-def _get_base(args: Sequence[str]) -> Tuple[int, ToxHandler, Source]:
+def _get_base(args: Sequence[str]) -> tuple[int, ToxHandler, Source]:
     """First just load the base options (verbosity+color) to setup the logging framework."""
     tox_parser = ToxParser.base()
     parsed, _ = tox_parser.parse_known_args(args)
@@ -44,7 +45,7 @@ def _get_base(args: Sequence[str]) -> Tuple[int, ToxHandler, Source]:
     return guess_verbosity, handler, source
 
 
-def _get_all(args: Sequence[str]) -> Tuple[Parsed, Handlers]:
+def _get_all(args: Sequence[str]) -> tuple[Parsed, Handlers]:
     """Parse all the options."""
     tox_parser = _get_parser()
     parsed = cast(Parsed, tox_parser.parse_args(args))