Merge pull request #248 from asottile/all-repos_autofix_all-repos-manual

py39+

.github/workflows/main.yml

@@ -8,6 +8,6 @@ on:
 
 jobs:
   main:
-    uses: asottile/workflows/.github/workflows/tox.yml@v1.5.0
+    uses: asottile/workflows/.github/workflows/tox.yml@v1.7.0
     with:
-      env: '["py38", "py39", "py310", "py311"]'
+      env: '["py39", "py310", "py311", "py312"]'

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
     rev: v3.13.0
     hooks:
     -   id: reorder-python-imports
-        args: [--py38-plus, --add-import, 'from __future__ import annotations']
+        args: [--py39-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/add-trailing-comma
     rev: v3.1.0
     hooks:
@@ -26,7 +26,7 @@ repos:
     rev: v3.17.0
     hooks:
     -   id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
 -   repo: https://github.com/hhatto/autopep8
     rev: v2.3.1
     hooks:

setup.cfg

@@ -20,7 +20,7 @@ classifiers =
 py_modules = setup_cfg_fmt
 install_requires =
     identify[license]>=2.4.0
-python_requires = >=3.8
+python_requires = >=3.9
 
 [options.entry_points]
 console_scripts =

setup_cfg_fmt.py

@@ -8,14 +8,13 @@
 import re
 import string
 import sys
-from typing import Generator
-from typing import Match
-from typing import Sequence
-from typing import Tuple
+from collections.abc import Generator
+from collections.abc import Sequence
+from re import Match
 
 from identify import identify
 
-Version = Tuple[int, ...]
+Version = tuple[int, ...]
 
 KEYS_ORDER: tuple[tuple[str, tuple[str, ...]], ...] = (
     (