Merge pull request #501 from languitar/chore/drop-python-3-10

build!: drop Python 3.10 support

Author: languitar

.github/workflows/ci.yml

@@ -52,7 +52,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
       - name: Clone repo

passgithelper.py

@@ -5,19 +5,17 @@
 .. codeauthor:: Johannes Wienke
 """
 
-
 import abc
 import argparse
 import configparser
 import fnmatch
 import logging
 import os
-import os.path
 from pathlib import Path
 import re
 import subprocess
 import sys
-from typing import Dict, IO, Mapping, Optional, Pattern, Sequence, Text
+from typing import IO, Mapping, Optional, Pattern, Sequence, Text
 
 import xdg.BaseDirectory
 
@@ -108,7 +106,7 @@ def parse(mapping_file: IO) -> configparser.ConfigParser:
         return parse(file_handle)
 
 
-def parse_request() -> Dict[str, str]:
+def parse_request() -> dict[str, str]:
     """Parse the request of the git credential API from stdin.
 
     Returns:
@@ -189,11 +187,10 @@ def __init__(self, prefix_length: int, option_suffix: Text = "") -> None:
         super().__init__(option_suffix)
         self._prefix_length = prefix_length
 
-    @abc.abstractmethod
     def configure(self, config: configparser.SectionProxy) -> None:
         """Configure the amount of characters to skip."""
         self._prefix_length = config.getint(
-            "skip{suffix}".format(suffix=self._option_suffix),
+            f"skip{self._option_suffix}",
             fallback=self._prefix_length,
         )
 
@@ -232,9 +229,7 @@ def __init__(self, line: int, prefix_length: int, option_suffix: Text = "") -> N
     def configure(self, config: configparser.SectionProxy) -> None:
         """See base class method."""
         super().configure(config)
-        self._line = config.getint(
-            "line{suffix}".format(suffix=self._option_suffix), fallback=self._line
-        )
+        self._line = config.getint(f"line{self._option_suffix}", fallback=self._line)
 
     def _get_raw(
         self, entry_name: Text, entry_lines: Sequence[Text]  # noqa: ARG002
@@ -266,16 +261,16 @@ def _build_matcher(self, regex: str) -> Pattern:
         matcher = re.compile(regex)
         if matcher.groups != 1:
             raise ValueError(
-                'Provided regex "{regex}" must contain a single '
-                "capture group for the value to return.".format(regex=regex)
+                f'Provided regex "{regex}" must contain a single '
+                "capture group for the value to return."
             )
         return matcher
 
     def configure(self, config: configparser.SectionProxy) -> None:
         """See base class method."""
         self._regex = self._build_matcher(
             config.get(
-                "regex{suffix}".format(suffix=self._option_suffix),
+                f"regex{self._option_suffix}",
                 fallback=self._regex.pattern,
             )
         )
@@ -446,9 +441,9 @@ def get_password(
     password = password_extractor.get_value(pass_target, lines)
     username = username_extractor.get_value(pass_target, lines)
     if password:
-        print("password={password}".format(password=password))  # noqa: T201
+        print(f"password={password}")  # noqa: T201
     if "username" not in request and username:
-        print("username={username}".format(username=username))  # noqa: T201
+        print(f"username={username}")  # noqa: T201
 
 
 def handle_skip() -> None:
@@ -481,18 +476,14 @@ def main(argv: Optional[Sequence[str]] = None) -> None:
         mapping = parse_mapping(args.mapping)
     except Exception as error:  # ok'ish for the main function
         LOGGER.critical("Unable to parse mapping file", exc_info=True)
-        print(  # noqa: T201
-            "Unable to parse mapping file: {error}".format(error=error), file=sys.stderr
-        )
+        print(f"Unable to parse mapping file: {error}", file=sys.stderr)  # noqa: T201
         sys.exit(1)
 
     if action == "get":
         try:
             get_password(request, mapping)
         except Exception as error:  # ok'ish for the main function
-            print(  # noqa: T201
-                "Unable to retrieve entry: {error}".format(error=error), file=sys.stderr
-            )
+            print(f"Unable to retrieve entry: {error}", file=sys.stderr)  # noqa: T201
             sys.exit(1)
     else:
         LOGGER.info("Action %s is currently not supported", action)

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [tool.ruff]
 src = ["src"]
-target-version = "py310"
+target-version = "py311"
 
 [tool.ruff.lint]
 select = [

setup.cfg

@@ -12,7 +12,7 @@ keywords =
     credentials
     password store
 classifiers =
-    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.11
     Topic :: Utilities
     License :: OSI Approved ::
     GNU Lesser General Public License v3 or later (LGPLv3+)
@@ -22,6 +22,7 @@ project_urls =
 [options]
 install_requires =
     pyxdg
+python_requires = >=3.11
 py_modules =
     passgithelper
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = coverage-clean,test-py{310,311,312,313}, check, coverage
+envlist = coverage-clean,test-py{311,312,313}, check, coverage
 
 [testenv]
 extras = test
@@ -18,7 +18,7 @@ commands = coverage erase
 depends =
 
 [testenv:coverage]
-depends = test-py{39,310,311,312,313}
+depends = test-py{311,312,313}
 deps =
     coverage
 skip_install = true
@@ -40,7 +40,6 @@ commands =
 
 [gh-actions]
 python =
-    3.10: py310, coverage
     3.11: py311, coverage
     3.12: py312, coverage
     3.13: py313, coverage