Remove pyupgrade and flynt pre-commit hooks (#203)

Use the corresponding ruff rules instead

Author: danielhollas

.pre-commit-config.yaml

@@ -24,11 +24,6 @@ repos:
       # Check and update the uv lockfile
     - id: uv-lock
 
-  - repo: https://github.com/ikamensh/flynt/
-    rev: '1.0.1'
-    hooks:
-    - id: flynt
-
   - repo: https://github.com/executablebooks/mdformat
     rev: '0.7.17'
     hooks:
@@ -39,12 +34,6 @@ repos:
       - mdformat-black
       files: (?x)^(README\.md|CHANGELOG\.md)$
 
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.14.0
-    hooks:
-    - id: pyupgrade
-      args: [--py37-plus]
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.8.6
     hooks:

disk_objectstore/cli.py

@@ -6,7 +6,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import List, Optional
+from typing import Optional
 
 import click
 
@@ -142,7 +142,7 @@ def callback(self, action, value):
 @main.command('add-files')
 @click.argument('files', nargs=-1, type=click.Path(exists=True))
 @pass_dostore
-def add_files(dostore: ContainerContext, files: List[str]):
+def add_files(dostore: ContainerContext, files: list[str]):
     """Add file(s) to the container"""
     with dostore.container as container:
         click.echo(f'Adding {len(files)} file(s) to container: {container.get_folder()}')

disk_objectstore/dataclasses.py

@@ -4,7 +4,7 @@
 """
 
 from dataclasses import asdict, dataclass
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import TYPE_CHECKING, Optional, Union
 
 if TYPE_CHECKING:
     from .container import ObjectType
@@ -113,10 +113,10 @@ class ValidationIssues:
         have some overlap
     """
 
-    invalid_hashes_loose: List[str]
-    invalid_hashes_packed: List[str]
-    invalid_sizes_packed: List[str]
-    overlapping_packed: List[str]
+    invalid_hashes_loose: list[str]
+    invalid_hashes_packed: list[str]
+    invalid_sizes_packed: list[str]
+    overlapping_packed: list[str]
 
     def __getitem__(self, item: str) -> Union[str, int, bool, None]:
         """Return members using dictionary access.

disk_objectstore/utils.py

@@ -13,6 +13,7 @@
 import os
 import uuid
 import zlib
+from collections.abc import Iterable, Iterator, Sequence
 from contextlib import contextmanager
 from enum import Enum
 from pathlib import Path
@@ -21,10 +22,7 @@
     Any,
     BinaryIO,
     Callable,
-    Iterable,
-    Iterator,
     Literal,
-    Sequence,
     Union,
 )
 from zlib import error

pyproject.toml

@@ -95,10 +95,6 @@ exclude = [
     'tests/',
 ]
 
-[tool.flynt]
-line-length = 120
-fail-on-change = true
-
 [tool.ruff]
 line-length = 120
 
@@ -134,7 +130,9 @@ select = [
   'PLE',  # pylint-error
   'PLR',  # pylint-refactor
   'PLW',  # pylint-warning
-  'RUF'  # ruff
+  'RUF',  # ruff
+  'FLY',  # flynt (f-string formatting)
+  'UP'    # pyupgrade
 ]
 
 [tool.mypy]