Merge pull request #279 from akaihola/drop-py36

Drop support for Python 3.6

Author: akaihola

.github/workflows/python-package.yml

@@ -47,7 +47,6 @@ jobs:
           - windows-latest
           - macos-latest
         python-version:
-          - '3.6'
           - '3.7'
           - '3.8'
           - '3.9'
@@ -110,7 +109,7 @@ jobs:
           from pyupgrade._main import main
           from glob import glob
           files = glob('**/*.py', recursive=True)
-          main(files + ['--py36-plus'])
+          main(files + ['--py37-plus'])
           "
       - name: Check dependencies for known security vulterabilities using Safety
         run: safety check

CHANGES.rst

@@ -76,6 +76,10 @@ Fixed
 - Handle isort file skip comment ``#isort:file_skip`` without an exception.
 - Fix compatibility with Pygments 2.11.2.
 
+Removed
+-------
+- Drop support for Python 3.6 which has reached end of life.
+
 
 1.3.2_ - 2021-10-28
 ===================

release_tools/update_contributors.py

@@ -19,7 +19,7 @@
 from itertools import groupby
 from pathlib import Path
 from textwrap import dedent, indent
-from typing import Any, Dict, Iterable, List, MutableMapping, Optional, Text, cast
+from typing import Any, Dict, Iterable, List, MutableMapping, Optional, cast
 
 import click
 import defusedxml.ElementTree
@@ -175,7 +175,7 @@ def request(  # type: ignore[override]  # pylint: disable=arguments-differ
         self,
         method: str,
         url: str,
-        headers: MutableMapping[Text, Text] = None,
+        headers: MutableMapping[str, str] = None,
         **kwargs: Any,
     ) -> Response:
         """Query GitHub API with authorization, caching and host auto-fill-in

setup.cfg

@@ -10,7 +10,6 @@ description = Apply Black formatting only in regions changed since last commit
 long_description_content_type = text/x-rst
 classifiers =
     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
@@ -30,10 +29,9 @@ install_requires =
     black>=21.5b1
     toml>=0.10.0
     typing-extensions ; python_version < "3.8"
-    dataclasses ; python_version < "3.7"
 # NOTE: remember to keep `.github/workflows/python-package.yml` in sync
 #       with the minimum required Python version
-python_requires = >=3.6
+python_requires = >=3.7
 
 [options.packages.find]
 where = src
@@ -70,19 +68,16 @@ test =
     pytest-mypy
     pyupgrade>=2.31.0
     regex>=2021.4.4
-    # TODO: upgrade requests-cache once we've dropped Python 3.6 support
-    requests_cache>=0.7,<0.8
+    requests_cache>=0.7
     ruamel.yaml>=0.17.21
     safety>=1.10.3
-    types-dataclasses ; python_version < "3.7"
     types-requests>=2.27.9
     types-toml>=0.10.4
 release =
     airium>=0.2.3
     click>=8.0.0
     defusedxml>=0.7.1
-    # TODO: upgrade requests-cache once we've dropped Python 3.6 support
-    requests_cache>=0.7,<0.8
+    requests_cache>=0.7
 
 [flake8]
 # Line length according to Black rules

src/darker/tests/helpers.py

@@ -2,19 +2,14 @@
 
 import re
 import sys
-from contextlib import contextmanager
+from contextlib import contextmanager, nullcontext
 from types import ModuleType
 from typing import Any, ContextManager, Dict, List, Optional, Union
 from unittest.mock import patch
 
 import pytest
 from _pytest.python_api import RaisesContext
 
-if sys.version_info >= (3, 7):
-    from contextlib import nullcontext
-else:
-    from contextlib import suppress as nullcontext
-
 
 def filter_dict(dct: Dict[str, Any], filter_key: str) -> Dict[str, Any]:
     """Return only given keys with their values from a dictionary"""