Merge pull request #260 from hartwork/python-3-10-to-3-14

Support Python 3.10 to 3.14

Author: hartwork

.github/workflows/run-tests.yml

@@ -12,7 +12,7 @@ jobs:
     name: Run the test suite
     strategy:
       matrix:
-        python-version: [3.9, 3.13]  # no particular need for in-between versions
+        python-version: ["3.10", 3.14]  # no particular need for in-between versions
         runs-on: [macos-latest, ubuntu-latest]
     runs-on: ${{ matrix.runs-on }}
     steps:

git_delete_merged_branches/_engine.py

@@ -6,7 +6,6 @@
 from functools import partial, reduce
 from operator import and_
 from subprocess import CalledProcessError
-from typing import Optional
 
 from ._git import CheckoutFailed, MergeBaseFailed, PullFailed
 from ._metadata import APP
@@ -197,7 +196,7 @@ def find_enabled_remotes(cls, git_config):
         return cls._filter_git_config(git_config, cls._PATTERN_REMOTE_ENABLED)
 
     def _find_branches_merged_using_git_branch_merged(
-        self, required_target_branches, remote_name: Optional[str]
+        self, required_target_branches, remote_name: str | None
     ) -> set[str]:
         if remote_name is None:
             find_branches_that_were_merged_into = self._git.find_merged_local_branches_for
@@ -301,7 +300,7 @@ def _find_branches_merged_using_git_cherry(
         return branches_merged_to_all_required_targets
 
     def _find_branches_merged_to_all_targets_for_single_remote(
-        self, required_target_branches, excluded_branches: set[str], remote_name: Optional[str]
+        self, required_target_branches, excluded_branches: set[str], remote_name: str | None
     ) -> tuple[set[str], set[str]]:
         if remote_name is not None:
             excluded_branches = {

git_delete_merged_branches/_git.py

@@ -4,7 +4,6 @@
 import os
 import subprocess
 from collections import OrderedDict
-from typing import Optional
 
 from ._metadata import APP
 
@@ -146,7 +145,7 @@ def find_remote_branches_at(self, remote_name) -> list[str]:
         extra_argv = ["--remote", "--list", f"{remote_name}/*"]
         return self._find_branches(extra_argv)
 
-    def find_current_branch(self) -> Optional[str]:
+    def find_current_branch(self) -> str | None:
         # Note: Avoiding "git branch --show-current" of Git >=2.22.0
         #       to keep Git 2.17.1 of Ubuntu 18.04 in the boat, for now.
         argv = [self._GIT, "rev-parse", "--symbolic-full-name", "HEAD"]
@@ -160,15 +159,15 @@ def find_current_branch(self) -> Optional[str]:
             return None  # detached head
         return reference[len(expected_prefix) :]
 
-    def find_working_tree_branches(self) -> list[Optional[str]]:
+    def find_working_tree_branches(self) -> list[str | None]:
         argv = [self._GIT, "worktree", "list", "--porcelain"]  # requires Git >=2.7.0
         output_bytes = self._subprocess_check_output(argv, is_write=False)
         lines = self._output_bytes_to_lines(output_bytes)
 
         detached_line_prefix = "detached"
         branch_line_prefix = "branch "
         branch_prefix = "refs/heads/"
-        branch_names: list[Optional[str]] = []
+        branch_names: list[str | None] = []
 
         for line in lines:
             if line.startswith(detached_line_prefix):
@@ -266,7 +265,7 @@ def pull_ff_only(self) -> None:
                 raise PullFailed
             raise
 
-    def _has_changes(self, extra_argv: Optional[list[str]] = None) -> bool:
+    def _has_changes(self, extra_argv: list[str] | None = None) -> bool:
         argv = [self._GIT, "diff", "--exit-code", "--quiet"]
         if extra_argv:
             argv += extra_argv

git_delete_merged_branches/_multiselect.py

@@ -3,7 +3,7 @@
 
 from abc import ABC
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 from prompt_toolkit.application import Application
 from prompt_toolkit.buffer import Buffer
@@ -137,7 +137,7 @@ def write_to_screen(
         write_position: WritePosition,
         parent_style: str,
         erase_bg: bool,
-        z_index: Optional[int],
+        z_index: int | None,
     ) -> None:
         self.current_height = write_position.height
         super().write_to_screen(
@@ -191,9 +191,9 @@ def __init__(
         self._header_lines: [_MultiSelectPrompt.HeaderLine] = []
         self._footer_lines: [_MultiSelectPrompt.PlainLine] = []
 
-        self._item_selection_pane: Optional[_HeightTrackingScrollablePane] = None
-        self._buffer: Optional[Buffer] = None
-        self._document: Optional[Document] = None
+        self._item_selection_pane: _HeightTrackingScrollablePane | None = None
+        self._buffer: Buffer | None = None
+        self._document: Document | None = None
         self._accepted_selection: list[Any] = None
 
     def _move_cursor_one_page_vertically(self, upwards: bool):

ruff.toml

@@ -1,6 +1,6 @@
 indent-width = 4
 line-length = 100
-target-version = "py39"
+target-version = "py310"
 
 [lint]
 select = [

setup.py

@@ -24,7 +24,7 @@
     author="Sebastian Pipping",
     author_email="sebastian@pipping.org",
     url=f"https://github.com/hartwork/{APP}",
-    python_requires=">=3.9",
+    python_requires=">=3.10",
     setup_requires=[
         "setuptools>=38.6.0",  # for long_description_content_type
     ],
@@ -48,11 +48,11 @@
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "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 :: Version Control",
         "Topic :: Software Development :: Version Control :: Git",
     ],