py39+

Author: asottile

.github/workflows/main.yml

@@ -15,9 +15,6 @@ jobs:
         - os: ubuntu-latest
           python: pypy-3.9
           toxenv: py
-        - os: ubuntu-latest
-          python: 3.8
-          toxenv: py
         - os: ubuntu-latest
           python: 3.9
           toxenv: py
@@ -28,11 +25,14 @@ jobs:
           python: '3.11'
           toxenv: py
         - os: ubuntu-latest
-          python: '3.12-dev'
+          python: '3.12'
+          toxenv: py
+        - os: ubuntu-latest
+          python: '3.13'
           toxenv: py
         # windows
         - os: windows-latest
-          python: 3.8
+          python: 3.9
           toxenv: py
         # misc
         - os: ubuntu-latest

.pre-commit-config.yaml

@@ -12,19 +12,19 @@ repos:
     hooks:
     -   id: setup-cfg-fmt
 -   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
+    rev: v3.14.0
     hooks:
     -   id: reorder-python-imports
         args: [
             --application-directories, '.:src',
-            --py38-plus,
+            --py39-plus,
             --add-import, 'from __future__ import annotations',
         ]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.19.1
     hooks:
     -   id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
 -   repo: https://github.com/psf/black
     rev: 23.12.1
     hooks:
@@ -35,7 +35,7 @@ repos:
     hooks:
     -   id: flake8
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
+    rev: v1.15.0
     hooks:
     -   id: mypy
         exclude: ^(docs/|example-plugin/)

bin/gen-pycodestyle-plugin

@@ -3,9 +3,9 @@ from __future__ import annotations
 
 import inspect
 import os.path
+from collections.abc import Generator
 from typing import Any
 from typing import Callable
-from typing import Generator
 from typing import NamedTuple
 
 import pycodestyle
@@ -42,7 +42,7 @@ class Call(NamedTuple):
         return cls(func.__name__, inspect.isgeneratorfunction(func), params)
 
 
-def lines() -> Generator[str, None, None]:
+def lines() -> Generator[str]:
     logical = []
     physical = []
 
@@ -58,8 +58,8 @@ def lines() -> Generator[str, None, None]:
     yield "# fmt: off"
     yield "from __future__ import annotations"
     yield ""
+    yield "from collections.abc import Generator"
     yield "from typing import Any"
-    yield "from typing import Generator"
     yield ""
     imports = sorted(call.name for call in logical + physical)
     for name in imports:
@@ -71,7 +71,7 @@ def lines() -> Generator[str, None, None]:
     logical_params = {param for call in logical for param in call.params}
     for param in sorted(logical_params):
         yield f"    {param}: Any,"
-    yield ") -> Generator[tuple[int, str], None, None]:"
+    yield ") -> Generator[tuple[int, str]]:"
     yield '    """Run pycodestyle logical checks."""'
     for call in sorted(logical):
         yield call.to_src()
@@ -82,7 +82,7 @@ def lines() -> Generator[str, None, None]:
     physical_params = {param for call in physical for param in call.params}
     for param in sorted(physical_params):
         yield f"    {param}: Any,"
-    yield ") -> Generator[tuple[int, str], None, None]:"
+    yield ") -> Generator[tuple[int, str]]:"
     yield '    """Run pycodestyle physical checks."""'
     for call in sorted(physical):
         yield call.to_src()

docs/source/internal/releases.rst

@@ -81,9 +81,9 @@ for users.
 
 Before releasing, the following tox test environments must pass:
 
-- Python 3.8 (a.k.a., ``tox -e py38``)
+- Python 3.9 (a.k.a., ``tox -e py39``)
 
-- Python 3.12 (a.k.a., ``tox -e py312``)
+- Python 3.13 (a.k.a., ``tox -e py313``)
 
 - PyPy 3 (a.k.a., ``tox -e pypy3``)
 

docs/source/user/invocation.rst

@@ -14,25 +14,25 @@ like so:
 
 Where you simply allow the shell running in your terminal to locate |Flake8|.
 In some cases, though, you may have installed |Flake8| for multiple versions
-of Python (e.g., Python 3.8 and Python 3.9) and you need to call a specific
+of Python (e.g., Python 3.13 and Python 3.14) and you need to call a specific
 version. In that case, you will have much better results using:
 
 .. prompt:: bash
 
-    python3.8 -m flake8
+    python3.13 -m flake8
 
 Or
 
 .. prompt:: bash
 
-    python3.9 -m flake8
+    python3.14 -m flake8
 
 Since that will tell the correct version of Python to run |Flake8|.
 
 .. note::
 
-    Installing |Flake8| once will not install it on both Python 3.8 and
-    Python 3.9. It will only install it for the version of Python that
+    Installing |Flake8| once will not install it on both Python 3.13 and
+    Python 3.14. It will only install it for the version of Python that
     is running pip.
 
 It is also possible to specify command-line options directly to |Flake8|:

example-plugin/setup.py

@@ -23,8 +23,6 @@
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Software Development :: Quality Assurance",
     ],

setup.cfg

@@ -31,7 +31,7 @@ install_requires =
     mccabe>=0.7.0,<0.8.0
     pycodestyle>=2.12.0,<2.13.0
     pyflakes>=3.2.0,<3.3.0
-python_requires = >=3.8.1
+python_requires = >=3.9
 package_dir =
     =src
 

src/flake8/checker.py

@@ -9,12 +9,10 @@
 import operator
 import signal
 import tokenize
+from collections.abc import Generator
+from collections.abc import Sequence
 from typing import Any
-from typing import Generator
-from typing import List
 from typing import Optional
-from typing import Sequence
-from typing import Tuple
 
 from flake8 import defaults
 from flake8 import exceptions
@@ -27,7 +25,7 @@
 from flake8.plugins.finder import LoadedPlugin
 from flake8.style_guide import StyleGuideManager
 
-Results = List[Tuple[str, int, int, str, Optional[str]]]
+Results = list[tuple[str, int, int, str, Optional[str]]]
 
 LOG = logging.getLogger(__name__)
 
@@ -53,7 +51,7 @@
 @contextlib.contextmanager
 def _mp_prefork(
     plugins: Checkers, options: argparse.Namespace
-) -> Generator[None, None, None]:
+) -> Generator[None]:
     # we can save significant startup work w/ `fork` multiprocessing
     global _mp_plugins, _mp_options
     _mp_plugins, _mp_options = plugins, options

src/flake8/discover_files.py

@@ -3,9 +3,9 @@
 
 import logging
 import os.path
+from collections.abc import Generator
+from collections.abc import Sequence
 from typing import Callable
-from typing import Generator
-from typing import Sequence
 
 from flake8 import utils
 
@@ -16,7 +16,7 @@ def _filenames_from(
     arg: str,
     *,
     predicate: Callable[[str], bool],
-) -> Generator[str, None, None]:
+) -> Generator[str]:
     """Generate filenames from an argument.
 
     :param arg:
@@ -55,7 +55,7 @@ def expand_paths(
     stdin_display_name: str,
     filename_patterns: Sequence[str],
     exclude: Sequence[str],
-) -> Generator[str, None, None]:
+) -> Generator[str]:
     """Expand out ``paths`` from commandline to the lintable files."""
     if not paths:
         paths = ["."]

src/flake8/main/application.py

@@ -5,7 +5,7 @@
 import json
 import logging
 import time
-from typing import Sequence
+from collections.abc import Sequence
 
 import flake8
 from flake8 import checker