Migrate from flake8 to ruff (#1231)

.flake8

@@ -1,5 +0,0 @@
-[flake8]
-extend-ignore = E203, E266, E501, W293, W291, W503
-max-line-length = 88
-max-complexity = 18
-select = B,C,E,F,W,T4,B9

.github/workflows/pythontest.yml

@@ -37,8 +37,8 @@ jobs:
         if: "matrix.os != 'windows-latest' && matrix.python-version != 'pypy3'"
       - name: Style checks
         run: |
-          pip install --upgrade flake8
-          python -m flake8
+          pip install --upgrade ruff
+          python -m ruff check .
       - name: Typing checks
         run: |
           pip install --upgrade mypy types-paramiko types-requests

CONTRIBUTING.rst

@@ -9,7 +9,7 @@ New functionality and bug fixes should be accompanied by matching unit tests.
 
 Coding style
 ------------
-Where possible, please follow PEP8 with regard to coding style. Run flake8.
+Where possible, please follow PEP8 with regard to coding style. Run ruff.
 
 Furthermore, triple-quotes should always be """, single quotes are ' unless
 using " would result in less escaping within the string.

Makefile

@@ -1,7 +1,7 @@
 PYTHON = python3
 PYFLAKES = $(PYTHON) -m pyflakes
 PEP8 = pep8
-FLAKE8 ?= $(PYTHON) -m flake8
+RUFF ?= $(PYTHON) -m ruff 
 SETUP = $(PYTHON) setup.py
 TESTRUNNER ?= unittest
 RUNTEST = PYTHONHASHSEED=random PYTHONPATH=$(shell pwd)$(if $(PYTHONPATH),:$(PYTHONPATH),) $(PYTHON) -m $(TESTRUNNER) $(TEST_OPTIONS)
@@ -60,7 +60,7 @@ pep8:
 	$(PEP8) dulwich
 
 style:
-	$(FLAKE8)
+	$(RUFF) check .
 
 before-push: check
 	git diff origin/master | $(PEP8) --diff

disperse.conf

@@ -2,7 +2,7 @@
 news_file: "NEWS"
 timeout_days: 5
 tag_name: "dulwich-$VERSION"
-verify_command: "flake8 && make check"
+verify_command: "make check"
 update_version {
   path: "dulwich/__init__.py"
   match: "^__version__ = \((.*)\)$"

dulwich/bundle.py

@@ -26,12 +26,12 @@ from .pack import PackData, write_pack_data
 
 
 class Bundle:
-    version: Optional[int] = None
+    version: Optional[int]
 
-    capabilities: Dict[str, str] = {}
-    prerequisites: List[Tuple[bytes, str]] = []
-    references: Dict[str, bytes] = {}
-    pack_data: Union[PackData, Sequence[bytes]] = []
+    capabilities: Dict[str, str]
+    prerequisites: List[Tuple[bytes, str]]
+    references: Dict[str, bytes]
+    pack_data: Union[PackData, Sequence[bytes]]
 
     def __repr__(self) -> str:
         return (

dulwich/cli.py

@@ -33,7 +33,7 @@ import os
 import signal
 import sys
 from getopt import getopt
-from typing import Dict, Optional, Type
+from typing import ClassVar, Dict, Optional, Type
 
 from dulwich import porcelain
 
@@ -610,8 +610,8 @@ class cmd_remote_add(Command):
 
 
 class SuperCommand(Command):
-    subcommands: Dict[str, Type[Command]] = {}
-    default_command: Optional[Type[Command]] = None
+    subcommands: ClassVar[Dict[str, Type[Command]]] = {}
+    default_command: ClassVar[Optional[Type[Command]]] = None
 
     def run(self, args):
         if not args and not self.default_command:
@@ -627,7 +627,7 @@ class SuperCommand(Command):
 
 
 class cmd_remote(SuperCommand):
-    subcommands = {
+    subcommands: ClassVar[Dict[str, Type[Command]]] = {
         "add": cmd_remote_add,
     }
 
@@ -648,7 +648,7 @@ class cmd_submodule_init(Command):
 
 
 class cmd_submodule(SuperCommand):
-    subcommands = {
+    subcommands: ClassVar[Dict[str, Type[Command]]] = {
         "init": cmd_submodule_init,
     }
 
@@ -700,7 +700,7 @@ class cmd_stash_pop(Command):
 
 
 class cmd_stash(SuperCommand):
-    subcommands = {
+    subcommands: ClassVar[Dict[str, Type[Command]]] = {
         "list": cmd_stash_list,
         "pop": cmd_stash_pop,
         "push": cmd_stash_push,

dulwich/client.py

@@ -50,6 +50,7 @@ from typing import (
     IO,
     TYPE_CHECKING,
     Callable,
+    ClassVar,
     Dict,
     Iterable,
     Iterator,
@@ -171,16 +172,8 @@ def _win32_peek_avail(handle):
 
 
 COMMON_CAPABILITIES = [CAPABILITY_OFS_DELTA, CAPABILITY_SIDE_BAND_64K]
-UPLOAD_CAPABILITIES = [
-    CAPABILITY_THIN_PACK,
-    CAPABILITY_MULTI_ACK,
-    CAPABILITY_MULTI_ACK_DETAILED,
-    CAPABILITY_SHALLOW,
-] + COMMON_CAPABILITIES
-RECEIVE_CAPABILITIES = [
-    CAPABILITY_REPORT_STATUS,
-    CAPABILITY_DELETE_REFS,
-] + COMMON_CAPABILITIES
+UPLOAD_CAPABILITIES = [CAPABILITY_THIN_PACK, CAPABILITY_MULTI_ACK, CAPABILITY_MULTI_ACK_DETAILED, CAPABILITY_SHALLOW, *COMMON_CAPABILITIES]
+RECEIVE_CAPABILITIES = [CAPABILITY_REPORT_STATUS, CAPABILITY_DELETE_REFS, *COMMON_CAPABILITIES]
 
 
 class ReportStatusParser:
@@ -262,7 +255,7 @@ class FetchPackResult:
       agent: User agent string
     """
 
-    _FORWARDED_ATTRS = [
+    _FORWARDED_ATTRS: ClassVar[Set[str]] = {
         "clear",
         "copy",
         "fromkeys",
@@ -277,7 +270,7 @@ class FetchPackResult:
         "viewitems",
         "viewkeys",
         "viewvalues",
-    ]
+    }
 
     def __init__(
         self, refs, symrefs, agent, new_shallow=None, new_unshallow=None
@@ -348,7 +341,7 @@ class SendPackResult:
         failed to update), or None if it was updated successfully
     """
 
-    _FORWARDED_ATTRS = [
+    _FORWARDED_ATTRS: ClassVar[Set[str]] = {
         "clear",
         "copy",
         "fromkeys",
@@ -363,7 +356,7 @@ class SendPackResult:
         "viewitems",
         "viewkeys",
         "viewvalues",
-    ]
+    }
 
     def __init__(self, refs, agent=None, ref_status=None) -> None:
         self.refs = refs
@@ -1380,7 +1373,7 @@ class SubprocessGitClient(TraditionalGitClient):
             path = path.decode(self._remote_path_encoding)
         if self.git_command is None:
             git_command = find_git_command()
-        argv = git_command + [service.decode("ascii"), path]
+        argv = [*git_command, service.decode("ascii"), path]
         p = subprocess.Popen(
             argv,
             bufsize=0,
@@ -1625,8 +1618,7 @@ class SubprocessSSHVendor(SSHVendor):
 
         if ssh_command:
             import shlex
-
-            args = shlex.split(ssh_command, posix=(sys.platform != "win32")) + ["-x"]
+            args = [*shlex.split(ssh_command, posix=sys.platform != "win32"), "-x"]
         else:
             args = ["ssh", "-x"]
 
@@ -1643,7 +1635,7 @@ class SubprocessSSHVendor(SSHVendor):
         args.append(host)
 
         proc = subprocess.Popen(
-            args + [command],
+            [*args, command],
             bufsize=0,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
@@ -1667,8 +1659,7 @@ class PLinkSSHVendor(SSHVendor):
     ):
         if ssh_command:
             import shlex
-
-            args = shlex.split(ssh_command, posix=(sys.platform != "win32")) + ["-ssh"]
+            args = [*shlex.split(ssh_command, posix=sys.platform != "win32"), "-ssh"]
         elif sys.platform == "win32":
             args = ["plink.exe", "-ssh"]
         else:
@@ -1696,7 +1687,7 @@ class PLinkSSHVendor(SSHVendor):
         args.append(host)
 
         proc = subprocess.Popen(
-            args + [command],
+            [*args, command],
             bufsize=0,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
@@ -1815,7 +1806,7 @@ def default_user_agent_string():
     return "git/dulwich/%s" % ".".join([str(x) for x in dulwich.__version__])
 
 
-def default_urllib3_manager(  # noqa: C901
+def default_urllib3_manager(
     config,
     pool_manager_cls=None,
     proxy_manager_cls=None,
@@ -2026,7 +2017,7 @@ class AbstractHttpGitClient(GitClient):
                     raise GitProtocolError(
                         "unexpected first line %r from smart server" % pkt
                     )
-                return read_pkt_refs(proto.read_pkt_seq()) + (base_url,)
+                return (*read_pkt_refs(proto.read_pkt_seq()), base_url)
             else:
                 return read_info_refs(resp), set(), base_url
         finally:

dulwich/config.py

@@ -524,8 +524,8 @@ class ConfigFile(ConfigDict):
         super().__init__(values=values, encoding=encoding)
         self.path: Optional[str] = None
 
-    @classmethod  # noqa: C901
-    def from_file(cls, f: BinaryIO) -> "ConfigFile":  # noqa: C901
+    @classmethod
+    def from_file(cls, f: BinaryIO) -> "ConfigFile":
         """Read configuration from a file-like object."""
         ret = cls()
         section: Optional[Section] = None

dulwich/contrib/swift.py

@@ -301,11 +301,11 @@ class SwiftConnector:
         auth_ret_json = json.loads(ret.read())
         token = auth_ret_json["access"]["token"]["id"]
         catalogs = auth_ret_json["access"]["serviceCatalog"]
-        object_store = [
+        object_store = next(
             o_store for o_store in catalogs if o_store["type"] == "object-store"
-        ][0]
+        )
         endpoints = object_store["endpoints"]
-        endpoint = [endp for endp in endpoints if endp["region"] == self.region_name][0]
+        endpoint = next(endp for endp in endpoints if endp["region"] == self.region_name)
         return endpoint[self.endpoint_type], token
 
     def test_root_exists(self):

dulwich/contrib/test_release_robot.py

@@ -26,6 +26,7 @@ import shutil
 import tempfile
 import time
 import unittest
+from typing import ClassVar, Dict, List, Optional, Tuple
 
 from dulwich.contrib import release_robot
 
@@ -68,10 +69,10 @@ class GetRecentTagsTest(unittest.TestCase):
     # Git repo for dulwich project
     test_repo = os.path.join(BASEDIR, "dulwich_test_repo.zip")
     committer = b"Mark Mikofski <mark.mikofski@sunpowercorp.com>"
-    test_tags = [b"v0.1a", b"v0.1"]
-    tag_test_data = {
-        test_tags[0]: [1484788003, b"3" * 40, None],
-        test_tags[1]: [1484788314, b"1" * 40, (1484788401, b"2" * 40)],
+    test_tags: ClassVar[List[bytes]] = [b"v0.1a", b"v0.1"]
+    tag_test_data: ClassVar[Dict[bytes, Tuple[int, bytes, Optional[Tuple[int, bytes]]]]] = {
+        test_tags[0]: (1484788003, b"3" * 40, None),
+        test_tags[1]: (1484788314, b"1" * 40, (1484788401, b"2" * 40)),
     }
 
     @classmethod

dulwich/file.py

@@ -23,6 +23,7 @@
 import os
 import sys
 import warnings
+from typing import ClassVar, Set
 
 
 def ensure_dir_exists(dirname):
@@ -114,7 +115,7 @@ class _GitFile:
         released. Typically this will happen in a finally block.
     """
 
-    PROXY_PROPERTIES = {
+    PROXY_PROPERTIES: ClassVar[Set[str]] = {
         "closed",
         "encoding",
         "errors",
@@ -123,7 +124,7 @@ class _GitFile:
         "newlines",
         "softspace",
     }
-    PROXY_METHODS = (
+    PROXY_METHODS: ClassVar[Set[str]] = {
         "__iter__",
         "flush",
         "fileno",
@@ -136,7 +137,7 @@ class _GitFile:
         "truncate",
         "write",
         "writelines",
-    )
+    }
 
     def __init__(self, filename, mode, bufsize, mask) -> None:
         self._filename = filename

dulwich/hooks.py

@@ -98,8 +98,8 @@ class ShellHook(Hook):
 
         try:
             ret = subprocess.call(
-                [os.path.relpath(self.filepath, self.cwd)] + list(args), cwd=self.cwd
-            )
+                [os.path.relpath(self.filepath, self.cwd), *list(args)],
+                cwd=self.cwd)
             if ret != 0:
                 if self.post_exec_callback is not None:
                     self.post_exec_callback(0, *args)

dulwich/pack.py

@@ -2778,8 +2778,8 @@ def extend_pack(
 
 try:
     from dulwich._pack import (  # type: ignore  # noqa: F811
-        apply_delta,  # type: ignore # noqa: F811
-        bisect_find_sha,  # type: ignore # noqa: F811
+        apply_delta,  # type: ignore
+        bisect_find_sha,  # type: ignore
     )
 except ImportError:
     pass

dulwich/protocol.py

@@ -77,29 +77,10 @@ COMMON_CAPABILITIES = [
     CAPABILITY_NO_PROGRESS,
 ]
 KNOWN_UPLOAD_CAPABILITIES = set(
-    COMMON_CAPABILITIES
-    + [
-        CAPABILITY_THIN_PACK,
-        CAPABILITY_MULTI_ACK,
-        CAPABILITY_MULTI_ACK_DETAILED,
-        CAPABILITY_INCLUDE_TAG,
-        CAPABILITY_DEEPEN_SINCE,
-        CAPABILITY_SYMREF,
-        CAPABILITY_SHALLOW,
-        CAPABILITY_DEEPEN_NOT,
-        CAPABILITY_DEEPEN_RELATIVE,
-        CAPABILITY_ALLOW_TIP_SHA1_IN_WANT,
-        CAPABILITY_ALLOW_REACHABLE_SHA1_IN_WANT,
-    ]
+    [*COMMON_CAPABILITIES, CAPABILITY_THIN_PACK, CAPABILITY_MULTI_ACK, CAPABILITY_MULTI_ACK_DETAILED, CAPABILITY_INCLUDE_TAG, CAPABILITY_DEEPEN_SINCE, CAPABILITY_SYMREF, CAPABILITY_SHALLOW, CAPABILITY_DEEPEN_NOT, CAPABILITY_DEEPEN_RELATIVE, CAPABILITY_ALLOW_TIP_SHA1_IN_WANT, CAPABILITY_ALLOW_REACHABLE_SHA1_IN_WANT]
 )
 KNOWN_RECEIVE_CAPABILITIES = set(
-    COMMON_CAPABILITIES
-    + [
-        CAPABILITY_REPORT_STATUS,
-        CAPABILITY_DELETE_REFS,
-        CAPABILITY_QUIET,
-        CAPABILITY_ATOMIC,
-    ]
+    [*COMMON_CAPABILITIES, CAPABILITY_REPORT_STATUS, CAPABILITY_DELETE_REFS, CAPABILITY_QUIET, CAPABILITY_ATOMIC]
 )
 
 DEPTH_INFINITE = 0x7FFFFFFF

dulwich/repo.py

@@ -281,7 +281,7 @@ def parse_graftpoints(
         else:
             parents = []
 
-        for sha in [commit] + parents:
+        for sha in [commit, *parents]:
             check_hexsha(sha, "Invalid graftpoint")
 
         grafts[commit] = parents
@@ -899,7 +899,7 @@ class BaseRepo:
         """
         # Simple validation
         for commit, parents in updated_graftpoints.items():
-            for sha in [commit] + parents:
+            for sha in [commit, *parents]:
                 check_hexsha(sha, "Invalid graftpoint")
 
         self._graftpoints.update(updated_graftpoints)
@@ -920,7 +920,7 @@ class BaseRepo:
         with f:
             return [line.strip() for line in f.readlines() if line.strip()]
 
-    def do_commit(  # noqa: C901
+    def do_commit(
         self,
         message: Optional[bytes] = None,
         committer: Optional[bytes] = None,
@@ -1042,7 +1042,7 @@ class BaseRepo:
         else:
             try:
                 old_head = self.refs[ref]
-                c.parents = [old_head] + merge_heads
+                c.parents = [old_head, *merge_heads]
                 if sign:
                     c.sign(keyid)
                 self.object_store.add_object(c)

dulwich/tests/__init__.py

@@ -37,8 +37,9 @@ import tempfile
 
 # If Python itself provides an exception, use that
 import unittest
+from typing import ClassVar, List
 from unittest import SkipTest, expectedFailure, skipIf
-from unittest import TestCase as _TestCase  # noqa: F401
+from unittest import TestCase as _TestCase
 
 
 class TestCase(_TestCase):
@@ -66,7 +67,7 @@ class BlackboxTestCase(TestCase):
     """Blackbox testing."""
 
     # TODO(jelmer): Include more possible binary paths.
-    bin_directories = [
+    bin_directories: ClassVar[List[str]] = [
         os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "bin")),
         "/usr/bin",
         "/usr/local/bin",
@@ -101,7 +102,7 @@ class BlackboxTestCase(TestCase):
         # expect the user to set up file associations for .py files.
         #
         # Save us from all that headache and call python with the bin script.
-        argv = [sys.executable, self.bin_path(name)] + args
+        argv = [sys.executable, self.bin_path(name), *args]
         return subprocess.Popen(
             argv,
             stdout=subprocess.PIPE,

dulwich/tests/compat/server_utils.py

@@ -91,7 +91,7 @@ class ServerTests:
         port = self._start_server(self._old_repo)
 
         run_git_or_fail(
-            ["push", self.url(port)] + self.branch_args(),
+            ["push", self.url(port), *self.branch_args()],
             cwd=self._new_repo.path,
         )
         self.assertReposEqual(self._old_repo, self._new_repo)
@@ -103,7 +103,7 @@ class ServerTests:
         port = self._start_server(self._old_repo)
 
         run_git_or_fail(
-            ["push", self.url(port)] + self.branch_args(),
+            ["push", self.url(port), *self.branch_args()],
             cwd=self._new_repo.path,
         )
         self.assertReposEqual(self._old_repo, self._new_repo)
@@ -124,7 +124,7 @@ class ServerTests:
         port = self._start_server(self._new_repo)
 
         run_git_or_fail(
-            ["fetch", self.url(port)] + self.branch_args(),
+            ["fetch", self.url(port), *self.branch_args()],
             cwd=self._old_repo.path,
         )
         # flush the pack cache so any new packs are picked up
@@ -138,7 +138,7 @@ class ServerTests:
         port = self._start_server(self._new_repo)
 
         run_git_or_fail(
-            ["fetch", self.url(port)] + self.branch_args(),
+            ["fetch", self.url(port), *self.branch_args()],
             cwd=self._old_repo.path,
         )
         # flush the pack cache so any new packs are picked up
@@ -249,7 +249,7 @@ class ServerTests:
 
         # Fetching at the same depth is a no-op.
         run_git_or_fail(
-            ["fetch", "--depth=2", self.url(port)] + self.branch_args(),
+            ["fetch", "--depth=2", self.url(port), *self.branch_args()],
             cwd=self._stub_repo.path,
         )
         expected_shallow = [
@@ -281,13 +281,13 @@ class ServerTests:
 
         # Fetching at the same depth is a no-op.
         run_git_or_fail(
-            ["fetch", "--depth=2", self.url(port)] + self.branch_args(),
+            ["fetch", "--depth=2", self.url(port), *self.branch_args()],
             cwd=self._stub_repo.path,
         )
 
         # The whole repo only has depth 4, so it should equal server_new.
         run_git_or_fail(
-            ["fetch", "--depth=4", self.url(port)] + self.branch_args(),
+            ["fetch", "--depth=4", self.url(port), *self.branch_args()],
             cwd=self._stub_repo.path,
         )
         self.assertEqual([], _get_shallow(clone))

dulwich/tests/compat/test_client.py

@@ -434,7 +434,7 @@ class TestSSHVendor:
         cmd = cmd.split("-", 1)
         path = path.replace("'", "")
         p = subprocess.Popen(
-            cmd + [path],
+            [*cmd, path],
             bufsize=0,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
@@ -498,7 +498,7 @@ class GitHTTPRequestHandler(http.server.SimpleHTTPRequestHandler):
         # Let's be quiet, the test suite is noisy enough already
         pass
 
-    def run_backend(self):  # noqa: C901
+    def run_backend(self):
         """Call out to git http-backend."""
         # Based on CGIHTTPServer.CGIHTTPRequestHandler.run_cgi:
         # Copyright (c) 2001-2010 Python Software Foundation;

dulwich/tests/compat/test_pack.py

@@ -101,10 +101,7 @@ class TestPack(PackTests):
             new_blob.data = orig_blob.data + (b"x" * 2**20)
             new_blob_2 = Blob()
             new_blob_2.data = new_blob.data + b"y"
-            all_to_pack = list(orig_pack.pack_tuples()) + [
-                (new_blob, None),
-                (new_blob_2, None),
-            ]
+            all_to_pack = [*list(orig_pack.pack_tuples()), (new_blob, None), (new_blob_2, None)]
             pack_path = os.path.join(self._tempdir, "pack_with_deltas")
             write_pack(pack_path, all_to_pack, deltify=True)
         output = run_git_or_fail(["verify-pack", "-v", pack_path])
@@ -140,10 +137,7 @@ class TestPack(PackTests):
             new_blob.data = "big blob" + ("x" * 2**25)
             new_blob_2 = Blob()
             new_blob_2.data = new_blob.data + "y"
-            all_to_pack = list(orig_pack.pack_tuples()) + [
-                (new_blob, None),
-                (new_blob_2, None),
-            ]
+            all_to_pack = [*list(orig_pack.pack_tuples()), (new_blob, None), (new_blob_2, None)]
             pack_path = os.path.join(self._tempdir, "pack_with_deltas")
             write_pack(pack_path, all_to_pack, deltify=True)
         output = run_git_or_fail(["verify-pack", "-v", pack_path])

dulwich/tests/compat/utils.py

@@ -143,7 +143,7 @@ def run_git(
     env["LC_ALL"] = env["LANG"] = "C"
     env["PATH"] = os.getenv("PATH")
 
-    args = [git_path] + args
+    args = [git_path, *args]
     popen_kwargs["stdin"] = subprocess.PIPE
     if capture_stdout:
         popen_kwargs["stdout"] = subprocess.PIPE

dulwich/tests/test_client.py

@@ -1571,14 +1571,7 @@ class PLinkSSHVendorTests(TestCase):
             binary = ["plink.exe", "-ssh"]
         else:
             binary = ["plink", "-ssh"]
-        expected = binary + [
-            "-pw",
-            "12345",
-            "-i",
-            "/tmp/id_rsa",
-            "host",
-            "git-clone-url",
-        ]
+        expected = [*binary, "-pw", "12345", "-i", "/tmp/id_rsa", "host", "git-clone-url"]
         self.assertListEqual(expected, args[0])
 
     def test_run_command_password(self):
@@ -1586,7 +1579,7 @@ class PLinkSSHVendorTests(TestCase):
             binary = ["plink.exe", "-ssh"]
         else:
             binary = ["plink", "-ssh"]
-        expected = binary + ["-pw", "12345", "host", "git-clone-url"]
+        expected = [*binary, "-pw", "12345", "host", "git-clone-url"]
 
         vendor = PLinkSSHVendor()
 
@@ -1619,14 +1612,7 @@ class PLinkSSHVendorTests(TestCase):
             binary = ["plink.exe", "-ssh"]
         else:
             binary = ["plink", "-ssh"]
-        expected = binary + [
-            "-P",
-            "2200",
-            "-i",
-            "/tmp/id_rsa",
-            "user@host",
-            "git-clone-url",
-        ]
+        expected = [*binary, "-P", "2200", "-i", "/tmp/id_rsa", "user@host", "git-clone-url"]
 
         vendor = PLinkSSHVendor()
         command = vendor.run_command(

dulwich/tests/test_pack.py

@@ -1174,7 +1174,7 @@ class DeltaChainIteratorTests(TestCase):
         f = BytesIO()
         entries = build_pack(f, objects_spec)
         # Delta resolution changed to DFS
-        indices = [0] + list(range(100, 0, -1))
+        indices = [0, *list(range(100, 0, -1))]
         self.assertEntriesMatch(indices, entries, self.make_pack_iter(f))
 
     def test_ext_ref(self):

dulwich/tests/test_porcelain.py

@@ -2088,13 +2088,11 @@ class PushTests(PorcelainTestCase):
 
             # Get the change in the target repo corresponding to the add
             # this will be in the foo branch.
-            change = list(
-                tree_changes(
+            change = next(iter(tree_changes(
                     self.repo,
                     self.repo[b"HEAD"].tree,
                     self.repo[b"refs/heads/foo"].tree,
-                )
-            )[0]
+                )))
             self.assertEqual(
                 os.path.basename(fullpath), change.new.path.decode("ascii")
             )

dulwich/tests/test_refs.py

@@ -24,6 +24,7 @@ import os
 import sys
 import tempfile
 from io import BytesIO
+from typing import ClassVar, Dict
 
 from dulwich import errors
 from dulwich.tests import SkipTest, TestCase
@@ -795,7 +796,7 @@ class ParseSymrefValueTests(TestCase):
 
 
 class StripPeeledRefsTests(TestCase):
-    all_refs = {
+    all_refs: ClassVar[Dict[bytes, bytes]] = {
         b"refs/heads/master": b"8843d7f92416211de9ebb963ff4ce28125932878",
         b"refs/heads/testing": b"186a005b134d8639a58b6731c7c1ea821a6eedba",
         b"refs/tags/1.0.0": b"a93db4b0360cc635a2b93675010bac8d101f73f0",
@@ -803,7 +804,7 @@ class StripPeeledRefsTests(TestCase):
         b"refs/tags/2.0.0": b"0749936d0956c661ac8f8d3483774509c165f89e",
         b"refs/tags/2.0.0^{}": b"0749936d0956c661ac8f8d3483774509c165f89e",
     }
-    non_peeled_refs = {
+    non_peeled_refs: ClassVar[Dict[bytes, bytes]] = {
         b"refs/heads/master": b"8843d7f92416211de9ebb963ff4ce28125932878",
         b"refs/heads/testing": b"186a005b134d8639a58b6731c7c1ea821a6eedba",
         b"refs/tags/1.0.0": b"a93db4b0360cc635a2b93675010bac8d101f73f0",

dulwich/tests/test_repository.py

@@ -736,8 +736,7 @@ r = Repo('.')
 r.stage(['foo'])
 """.format(
             executable=sys.executable,
-            path=[os.path.join(os.path.dirname(__file__), "..", "..")] + sys.path,
-        )
+            path=[os.path.join(os.path.dirname(__file__), "..", ".."), *sys.path])
 
         repo_dir = os.path.join(self.mkdtemp())
         self.addCleanup(shutil.rmtree, repo_dir)

dulwich/tests/test_server.py

@@ -175,7 +175,7 @@ class UploadPackHandlerTestCase(TestCase):
         self.assertRaises(IndexError, self._handler.proto.get_received_line, 2)
 
     def test_no_progress(self):
-        caps = list(self._handler.required_capabilities()) + [b"no-progress"]
+        caps = [*list(self._handler.required_capabilities()), b"no-progress"]
         self._handler.set_client_capabilities(caps)
         self._handler.progress(b"first message")
         self._handler.progress(b"second message")
@@ -198,7 +198,7 @@ class UploadPackHandlerTestCase(TestCase):
         self._repo.refs._peeled_refs = peeled
         self._repo.refs.add_packed_refs(refs)
 
-        caps = list(self._handler.required_capabilities()) + [b"include-tag"]
+        caps = [*list(self._handler.required_capabilities()), b"include-tag"]
         self._handler.set_client_capabilities(caps)
         self.assertEqual(
             {b"1234" * 10: ONE, b"5678" * 10: TWO},
@@ -541,7 +541,7 @@ class ProtocolGraphWalkerTestCase(TestCase):
     # TODO: test commit time cutoff
 
     def _handle_shallow_request(self, lines, heads):
-        self._walker.proto.set_output(lines + [None])
+        self._walker.proto.set_output([*lines, None])
         self._walker._handle_shallow_request(heads)
 
     def assertReceived(self, expected):
@@ -1123,7 +1123,7 @@ class ServeCommandTests(TestCase):
     def serve_command(self, handler_cls, args, inf, outf):
         return serve_command(
             handler_cls,
-            [b"test"] + args,
+            [b"test", *args],
             backend=self.backend,
             inf=inf,
             outf=outf,

dulwich/tests/test_walk.py

@@ -509,7 +509,7 @@ class WalkEntryTest(TestCase):
 
         # Get the WalkEntry for the commit.
         walker = Walker(self.store, c1.id)
-        walker_entry = list(walker)[0]
+        walker_entry = next(iter(walker))
         changes = walker_entry.changes()
 
         # Compare the changes with the expected values.
@@ -571,7 +571,7 @@ class WalkEntryTest(TestCase):
 
         # Get the WalkEntry for the commit.
         walker = Walker(self.store, c1.id)
-        walker_entry = list(walker)[0]
+        walker_entry = next(iter(walker))
         changes = walker_entry.changes(path_prefix=b"x")
 
         # Compare the changes with the expected values.

dulwich/web.py

@@ -26,7 +26,7 @@ import re
 import sys
 import time
 from io import BytesIO
-from typing import List, Optional, Tuple
+from typing import Callable, ClassVar, Dict, Iterator, List, Optional, Tuple
 from urllib.parse import parse_qs
 from wsgiref.simple_server import (
     ServerHandler,
@@ -41,6 +41,7 @@ from .protocol import ReceivableProtocol
 from .repo import BaseRepo, NotGitRepository, Repo
 from .server import (
     DEFAULT_HANDLERS,
+    Backend,
     DictBackend,
     generate_info_refs,
     generate_objects_info_packs,
@@ -392,7 +393,7 @@ class HTTPGitApplication:
       backend: the Backend object backing this application
     """
 
-    services = {
+    services: ClassVar[Dict[Tuple[str, re.Pattern], Callable[[HTTPGitRequest, Backend, re.Match], Iterator[bytes]]]] = {
         ("GET", re.compile("/HEAD$")): get_text_file,
         ("GET", re.compile("/info/refs$")): get_info_refs,
         ("GET", re.compile("/objects/info/alternates$")): get_text_file,

pyproject.toml

@@ -75,6 +75,7 @@ select = [
     "F",
     "I",
     "UP",
+    "RUF",
 ]
 ignore = [
     "ANN001",