Drop support for running with Python 3.9 and old --pyXX-plus arguments (#702)

cdce8p · web-flow · commit 588526b31888 · 2025-11-11T01:23:34.000+01:00
diff --git a/.github/workflows/cache_ci.yaml b/.github/workflows/cache_ci.yaml
@@ -17,7 +17,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       ARTIFACT_NAME: cleanup_cache
       ALL_VENV_PREFIXES: venv, venv-base, pre-commit
-      ALL_PYTHON_VERSIONS: 3.9, 3.10, 3.11, 3.12, 3.13, 3.14
+      ALL_PYTHON_VERSIONS: 3.10, 3.11, 3.12, 3.13, 3.14
     steps:
       - name: Download workflow artifact
         id: download-artifact
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,7 +9,7 @@ on:
 
 env:
   CACHE_VERSION: 1
-  DEFAULT_PYTHON: "3.9"
+  DEFAULT_PYTHON: "3.10"
   LIB_FOLDER: python_typing_update
   PRE_COMMIT_CACHE: ~/.cache/pre-commit
 
@@ -149,7 +149,7 @@ jobs:
     runs-on: *runs-on-ubuntu
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
     outputs:
       python-key: ${{ steps.generate-python-key.outputs.key }}
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ repos:
     rev: v3.20.0
     hooks:
       - id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
         exclude: &fixtures ^tests/fixtures/.+\.py$
   - repo: https://github.com/pycqa/flake8
     rev: 7.3.0
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Marc Mueller
+Copyright (c) 2025 Marc Mueller
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -133,29 +133,20 @@ Check `git diff` before committing!
 
 ### Python version options
 
-**`--py37-plus`**
-Set the minimum Python syntax version to **3.7**. (Default: **3.9**)
-
-**`--py38-plus`**  
-Set the minimum Python syntax version to **3.8**. (Default: **3.9**)
-
-**`--py39-plus`**  
-Set the minimum Python syntax version to **3.9**. This is the default.
-
 **`--py310-plus`**  
-Set the minimum Python syntax version to **3.10**. (Default: **3.9**)
+Set the minimum Python syntax version to **3.10**. This is the default.
 
 **`--py311-plus`**  
-Set the minimum Python syntax version to **3.11**. (Default: **3.9**)
+Set the minimum Python syntax version to **3.11**. (Default: **3.10**)
 
 **`--py312-plus`**  
-Set the minimum Python syntax version to **3.12**. (Default: **3.9**)
+Set the minimum Python syntax version to **3.12**. (Default: **3.10**)
 
 **`--py313-plus`**
-Set the minimum Python syntax version to **3.13**. (Default: **3.9**)
+Set the minimum Python syntax version to **3.13**. (Default: **3.10**)
 
 **`--py314-plus`**
-Set the minimum Python syntax version to **3.14**. (Default: **3.9**)
+Set the minimum Python syntax version to **3.14**. (Default: **3.10**)
 
 
 ## License
diff --git a/pylintrc b/pylintrc
@@ -3,7 +3,7 @@ ignore=
 load-plugins =
     pylint.extensions.typing,
     pylint.extensions.code_style,
-py-version = 3.9
+py-version = 3.10
 
 [BASIC]
 good-names =
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,15 +14,14 @@ keywords    = ["typing", "pep585", "pep604"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
     "Topic :: Software Development",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies    = [
     "aiofiles==25.1.0",
     "autoflake==2.3.1",
@@ -71,7 +70,7 @@ asyncio_default_fixture_loop_scope = "function"
 
 [tool.mypy]
 # https://mypy.readthedocs.io/en/stable/config_file.html
-python_version = "3.9"
+python_version = "3.10"
 show_error_codes = true
 ignore_missing_imports = true
 strict = true
diff --git a/python_typing_update/__main__.py b/python_typing_update/__main__.py
@@ -105,22 +105,10 @@ async def async_main(argv: list[str] | None = None) -> int:
     )
 
     group_py_version = py_version_options.add_mutually_exclusive_group()
-    group_py_version.add_argument(
-        '--py37-plus',
-        action='store_const', dest='min_version', const=(3, 7), default=(3, 9),
-    )
-    group_py_version.add_argument(
-        '--py38-plus',
-        action='store_const', dest='min_version', const=(3, 8),
-    )
-    group_py_version.add_argument(
-        '--py39-plus',
-        action='store_const', dest='min_version', const=(3, 9),
-        help="Default"
-    )
     group_py_version.add_argument(
         '--py310-plus',
-        action='store_const', dest='min_version', const=(3, 10),
+        action='store_const', dest='min_version', const=(3, 10),  default=(3, 10),
+        help="Default"
     )
     group_py_version.add_argument(
         '--py311-plus',
diff --git a/python_typing_update/main.py b/python_typing_update/main.py
@@ -45,7 +45,7 @@ async def typing_update(
     version_string = f"--py{''.join(map(str, args.min_version))}-plus"
 
     # Add, replace and reorder imports
-    reorder_args: list[str | None] = []
+    reorder_args: list[str] = []
     if args.min_version < (3, 10):
         reorder_args += ['--add-import', 'from __future__ import annotations']
     if args.full_reorder:
diff --git a/tests/fixtures/changed_fixed.py b/tests/fixtures/changed_fixed.py
@@ -1,9 +1,8 @@
 """Update typing syntax for Python 3.8+"""
-from __future__ import annotations
+from collections.abc import Container, Hashable
+from typing import Any, TypeGuard
 
-from typing import Any, Container, Hashable
-
-from typing_extensions import TypedDict, TypeGuard
+from typing_extensions import TypedDict
 
 var1: list[str]
 var2: Any
diff --git a/tests/fixtures/changed_full_reorder_38.py b/tests/fixtures/changed_full_reorder_38.py
diff --git a/tests/fixtures/changed_full_reorder_39.py b/tests/fixtures/changed_full_reorder_39.py
@@ -1,10 +1,8 @@
 """Update typing syntax for Python 3.8+"""
-from __future__ import annotations
-
 from collections.abc import Container, Hashable
-from typing import Any
+from typing import Any, TypeGuard
 
-from typing_extensions import TypedDict, TypeGuard
+from typing_extensions import TypedDict
 
 var1: list[str]
 var2: Any
diff --git a/tests/fixtures/comment_1_forced.py b/tests/fixtures/comment_1_forced.py
@@ -1,6 +1,4 @@
 """Comment will be changed. Only valid with '--force'."""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_2_forced.py b/tests/fixtures/comment_2_forced.py
@@ -1,6 +1,4 @@
 """Comment will be changed. Only valid with '--force'."""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_3_forced.py b/tests/fixtures/comment_3_forced.py
@@ -1,6 +1,4 @@
 """Comment will be changed. Only valid with '--force'."""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_4_forced.py b/tests/fixtures/comment_4_forced.py
@@ -1,6 +1,4 @@
 """Comment will be changed. Only valid with '--force'."""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_5_forced.py b/tests/fixtures/comment_5_forced.py
@@ -1,6 +1,4 @@
 """Comment will be changed. Only valid with '--force'."""
-from __future__ import annotations
-
 from typing import List  # this comment should not be deleted
 
 var2: list[int]
diff --git a/tests/fixtures/comment_import_no_issue_1_fixed.py b/tests/fixtures/comment_import_no_issue_1_fixed.py
@@ -1,6 +1,4 @@
 """Comment will be kept"""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_import_no_issue_2_fixed.py b/tests/fixtures/comment_import_no_issue_2_fixed.py
@@ -1,6 +1,4 @@
 """Comment will be kept"""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_import_no_issue_3_fixed.py b/tests/fixtures/comment_import_no_issue_3_fixed.py
@@ -1,6 +1,4 @@
 """Comment will be kept"""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_import_no_issue_4_fixed.py b/tests/fixtures/comment_import_no_issue_4_fixed.py
@@ -1,6 +1,4 @@
 """Comment will be kept"""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_no_issue_1_fixed.py b/tests/fixtures/comment_no_issue_1_fixed.py
@@ -1,6 +1,4 @@
 """Comment is ignored"""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_no_issue_2_fixed.py b/tests/fixtures/comment_no_issue_2_fixed.py
@@ -1,6 +1,4 @@
 """Comment is ignored"""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_no_issue_3_fixed.py b/tests/fixtures/comment_no_issue_3_fixed.py
@@ -1,6 +1,4 @@
 """Comment is ignored"""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_no_issue_4_fixed.py b/tests/fixtures/comment_no_issue_4_fixed.py
@@ -1,6 +1,4 @@
 """Comment is ignored"""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_no_issue_5_fixed.py b/tests/fixtures/comment_no_issue_5_fixed.py
@@ -1,7 +1,5 @@
 # This is a comment
 """Comment is ignored"""
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/comment_no_issue_6_fixed.py b/tests/fixtures/comment_no_issue_6_fixed.py
@@ -1,7 +1,5 @@
 """Comment is ignored"""
 # This is a comment
-from __future__ import annotations
-
 import sys
 from typing import Any
 
diff --git a/tests/fixtures/empty_line.py b/tests/fixtures/empty_line.py
@@ -1,4 +1,4 @@
-"""Update typing syntax for Python 3.8+"""
+"""Update typing syntax for Python 3.10+"""
 
 from typing import Any, List, Union
 
diff --git a/tests/fixtures/empty_line_fixed.py b/tests/fixtures/empty_line_fixed.py
@@ -1,6 +1,4 @@
-"""Update typing syntax for Python 3.8+"""
-from __future__ import annotations
-
+"""Update typing syntax for Python 3.10+"""
 from typing import Any
 
 var1: list[str]
diff --git a/tests/fixtures/keep_updates_fixed.py b/tests/fixtures/keep_updates_fixed.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from typing import List, Union
+from typing import Union
 
 var1: list[int]
-var2 = List[int]
+var2 = list[int]
 var3: int | str
 var4 = Union[int, str]
diff --git a/tests/fixtures/keep_updates_no_change.py b/tests/fixtures/keep_updates_no_change.py
diff --git a/tests/fixtures/type_alias_310_no_change.py b/tests/fixtures/type_alias_310_no_change.py
diff --git a/tests/fixtures/type_alias_39_fixed.py b/tests/fixtures/type_alias_39_fixed.py
@@ -1,4 +1,3 @@
 """Type Alias requires Python 3.9+"""
-from __future__ import annotations
 
 Alias = list[int]
diff --git a/tests/fixtures/type_alias_39_no_change.py b/tests/fixtures/type_alias_39_no_change.py
diff --git a/tests/fixtures/unused_import_1_fixed.py b/tests/fixtures/unused_import_1_fixed.py
@@ -1,6 +1,4 @@
 """Test unused import retention."""
-from __future__ import annotations
-
 from typing import Any
 
 import const
diff --git a/tests/fixtures/unused_import_2_fixed.py b/tests/fixtures/unused_import_2_fixed.py
@@ -1,6 +1,4 @@
 """Test unused import retention."""
-from __future__ import annotations
-
 from typing import Any
 
 from const import xyz
diff --git a/tests/fixtures/unused_import_3_fixed.py b/tests/fixtures/unused_import_3_fixed.py
@@ -1,6 +1,4 @@
 """Test unused import retention."""
-from __future__ import annotations
-
 from typing import Any
 
 from const import x, y, z
diff --git a/tests/fixtures/unused_import_4_fixed.py b/tests/fixtures/unused_import_4_fixed.py
@@ -1,6 +1,4 @@
 """Test unused import retention."""
-from __future__ import annotations
-
 from typing import Any
 
 from const import x, y, z
diff --git a/tests/fixtures/unused_import_5_forced.py b/tests/fixtures/unused_import_5_forced.py
@@ -1,6 +1,4 @@
 """Test unused import retention."""
-from __future__ import annotations
-
 from typing import Any
 
 var1: list[str]
diff --git a/tests/fixtures/unused_import_6_forced.py b/tests/fixtures/unused_import_6_forced.py
@@ -1,6 +1,4 @@
 """Test unused import retention."""
-from __future__ import annotations
-
 from typing import Any
 
 var1: list[str]
diff --git a/tests/fixtures/unused_import_7_forced.py b/tests/fixtures/unused_import_7_forced.py
@@ -1,6 +1,4 @@
 """Test unused import retention."""
-from __future__ import annotations
-
 from typing import Any
 
 var1: list[str]
diff --git a/tests/fixtures/unused_import_8_forced.py b/tests/fixtures/unused_import_8_forced.py
diff --git a/tests/fixtures/unused_import_comment_1_fixed.py b/tests/fixtures/unused_import_comment_1_fixed.py
diff --git a/tests/fixtures/unused_import_comment_2_fixed.py b/tests/fixtures/unused_import_comment_2_fixed.py
diff --git a/tests/fixtures/unused_import_comment_3_forced.py b/tests/fixtures/unused_import_comment_3_forced.py
diff --git a/tests/fixtures/unused_import_comment_4_forced.py b/tests/fixtures/unused_import_comment_4_forced.py
diff --git a/tests/fixtures/unused_import_comment_5_fixed.py b/tests/fixtures/unused_import_comment_5_fixed.py
diff --git a/tests/fixtures/unused_import_comment_6_fixed.py b/tests/fixtures/unused_import_comment_6_fixed.py
diff --git a/tests/fixtures/unused_import_comment_7_forced.py b/tests/fixtures/unused_import_comment_7_forced.py
diff --git a/tests/fixtures/unused_import_comment_8_forced.py b/tests/fixtures/unused_import_comment_8_forced.py
diff --git a/tests/test_main.py b/tests/test_main.py
