Merge cd543c9 into 8f95162

pyproject.toml

@@ -75,17 +75,17 @@ include = [
 # from `tests` so the root directory must be added to Python's path for editable installations
 dev-mode-dirs = ["."]
 
-# Black section
-# Read more here: https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html#configuration-via-a-file
-[tool.black]
+# Ruff section
+# Read more here: https://docs.astral.sh/ruff/linter/#rule-selection
+[tool.ruff]
 line-length=80
 
-# Isort section
-# Read more here: https://pycqa.github.io/isort/docs/configuration/config_files.html
-[tool.isort]
-profile="black"
-line_length=80
-known_first_party = ["tuf"]
+[tool.ruff.lint]
+ignore = ["D400","D415","D213","D205","D202","D107","D407","D413","D212","D104","D406","D105","D411","D401","D200","D203"]
+
+[tool.ruff.lint.per-file-ignores] 
+"tuf/repository/__init__.py" = ["F401"]
+"tuf/api/exceptions.py" = ["F401"]
 
 # Pylint section
 
@@ -156,7 +156,3 @@ module = [
   "securesystemslib.*",
 ]
 ignore_missing_imports = "True"
-
-[tool.pydocstyle]
-inherit = false
-ignore = "D400,D415,D213,D205,D202,D107,D407,D413,D212,D104,D406,D105,D411,D401,D200,D203"

requirements/lint.txt

@@ -6,9 +6,7 @@
 # Lint tools
 # (We are not so interested in the specific versions of the tools: the versions
 # are pinned to prevent unexpected linting failures when tools update)
-black==24.2.0
-isort==5.13.2
 pylint==3.0.3
+ruff==0.2.1
 mypy==1.8.0
 bandit==1.7.7
-pydocstyle==6.3.0

tests/test_updater_top_level_update.py

@@ -555,9 +555,9 @@ def test_new_targets_hash_mismatch(self) -> None:
         # Modify targets contents without updating
         # snapshot's targets hashes
         self.sim.targets.version += 1
-        self.sim.snapshot.meta["targets.json"].version = (
-            self.sim.targets.version
-        )
+        self.sim.snapshot.meta[
+            "targets.json"
+        ].version = self.sim.targets.version
         self.sim.snapshot.version += 1
         self.sim.update_timestamp()
 

tests/utils.py

@@ -57,7 +57,7 @@ def run_sub_tests_with_dataset(
     cases in dataset"""
 
     def real_decorator(
-        function: Callable[[unittest.TestCase, Any], None]
+        function: Callable[[unittest.TestCase, Any], None],
     ) -> Callable[[unittest.TestCase], None]:
         def wrapper(test_cls: unittest.TestCase) -> None:
             for case, data in dataset.items():

tox.ini

@@ -47,16 +47,14 @@ deps =
     --editable {toxinidir}
 lint_dirs = tuf examples tests verify_release
 commands =
-    black --check --diff {[testenv:lint]lint_dirs}
-    isort --check --diff {[testenv:lint]lint_dirs}
+    ruff check  --diff {[testenv:lint]lint_dirs}
+    ruff format --diff {[testenv:lint]lint_dirs}
     pylint -j 0 --rcfile=pyproject.toml {[testenv:lint]lint_dirs}
 
     mypy {[testenv:lint]lint_dirs}
-
+    
     bandit -r tuf
 
-    pydocstyle tuf
-
 [testenv:docs]
 deps =
     -r{toxinidir}/requirements/docs.txt