Explicitly use Python 3.11 everywhere

.github/workflows/cd_release.yml

@@ -22,10 +22,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.11'
 
     - name: Install Python dependencies
       run: |

.github/workflows/ci_dependabot.yml

@@ -23,10 +23,10 @@ jobs:
       with:
         ref: main
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.11'
 
     - name: Install `pre-commit`
       run: |

.github/workflows/ci_tests.yml

@@ -17,10 +17,10 @@ jobs:
         token: ${{ secrets.CI_RESET_TEST_BRANCHES }}
         fetch-depth: 0
 
-    - name: Set up Python 3.9
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: '3.11'
 
     - name: Reset branches
       run: |
@@ -289,10 +289,10 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.11'
 
     - name: Install dependencies
       run: |
@@ -319,10 +319,10 @@ jobs:
       with:
         fetch-depth: 2
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: '3.11'
 
     - name: Install dependencies
       run: |

.pre-commit-config.yaml

@@ -1,13 +1,7 @@
 default_language_version:
-  python: python3.8
+  python: python3.11
 
 repos:
-  - repo: https://github.com/ambv/black
-    rev: 23.11.0
-    hooks:
-    - id: black
-      name: Blacken
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
@@ -22,6 +16,18 @@ repos:
       name: Fix requirements*.txt
       files: ^requirements.*\.txt$
 
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+    - id: pyupgrade
+      args: [--py311-plus]
+
+  - repo: https://github.com/ambv/black
+    rev: 23.11.0
+    hooks:
+    - id: black
+      name: Blacken
+
   - repo: https://github.com/PyCQA/bandit
     rev: '1.7.5'
     hooks:

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:alpine
+FROM python:3.11-alpine
 
 COPY README.md setup.py requirements*.txt ./
 COPY push_action ./push_action

push_action/cache.py

@@ -7,7 +7,8 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:  # pragma: no cover
-    from typing import Any, Iterator
+    from typing import Any
+    from collections.abc import Iterator
 
 
 class InMemoryCache:

push_action/run.py

@@ -186,7 +186,7 @@ def unprotect_reviews() -> None:
 def protect_reviews() -> None:
     """Re-add pull request review protection for target branch"""
     # Retrieve data
-    with open("tmp_protection_rules.json", "r", encoding="utf8") as handle:
+    with open("tmp_protection_rules.json", encoding="utf8") as handle:
         data = json.load(handle)
 
     # Add protection

push_action/utils.py

@@ -21,7 +21,8 @@
 from push_action.validate import validate_rest_api_base_url
 
 if TYPE_CHECKING:  # pragma: no cover
-    from typing import Callable, List, Union
+    from typing import List, Union
+    from collections.abc import Callable
 
 
 LOGGER = logging.getLogger("push_action.utils")

push_action/validate.py

@@ -40,7 +40,7 @@ def validate_conclusions(conclusions: list[str]) -> list[str]:
         )
 
     # Remove redundant entries and conform to lowercase
-    conclusions = list(set(conclusion.lower() for conclusion in conclusions))
+    conclusions = list({conclusion.lower() for conclusion in conclusions})
 
     for conclusion in conclusions:
         invalid_conclusions: list[str] = []

pyproject.toml

@@ -1,5 +1,5 @@
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.11"
 ignore_missing_imports = true
 scripts_are_modules = true
 warn_unused_configs = true

setup.py

@@ -14,7 +14,7 @@
 
 TOP_DIR = Path(__file__).parent.resolve()
 
-with open(TOP_DIR / "push_action" / "__init__.py", "r", encoding="utf8") as handle:
+with open(TOP_DIR / "push_action" / "__init__.py", encoding="utf8") as handle:
     for line in handle.readlines():
         version = re.findall(r'__version__ = "(.*)"', line)
         if version:
@@ -39,12 +39,10 @@
     packages=find_packages(),
     classifiers=[
         "Development Status :: 5 - Production/Stable",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.11",
         "Intended Audience :: Developers",
     ],
-    python_requires=">=3.8",
+    python_requires=">=3.11,<3.12",
     install_requires=(TOP_DIR / "requirements.txt").read_text(),
     extras_require={"dev": (TOP_DIR / "requirements_dev.txt").read_text()},
     entry_points={"console_scripts": ["push-action=push_action.run:main"]},