update(tooling): bump git hooks and add ruff as dev dependencies (#374)

Guts · web-flow · commit 078c67e003dd · 2025-05-13T16:10:42.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,11 +1,12 @@
-exclude: ".venv|__pycache__|tests/dev/|tests/fixtures/"
+exclude: ".venv|build|dist|__pycache__|tests/dev/|tests/fixtures/"
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
-        args: ["--maxkb=500"]
+        args:
+          - --maxkb=500
       - id: check-ast
       - id: check-builtin-literals
       - id: check-case-conflict
@@ -15,45 +16,65 @@ repos:
       - id: end-of-file-fixer
       - id: fix-byte-order-marker
       - id: fix-encoding-pragma
-        args: [--remove]
+        args:
+          - --remove
       - id: name-tests-test
-        args: [--pytest-test-first]
+        args:
+          - --pytest-test-first
       - id: trailing-whitespace
-        args: [--markdown-linebreak-ext=md]
+        args:
+          - --markdown-linebreak-ext=md
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.19.1
     hooks:
       - id: pyupgrade
         args:
-          - "--py39-plus"
+          - --py39-plus
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: "v0.11.4"
     hooks:
       - id: ruff
-        args: ["--fix-only", "--target-version=py39"]
+        args:
+          - --fix
+          - --target-version=py39
+        types_or:
+          - python
+          - pyi
+      - id: ruff-format
+        args:
+          - --line-length=88
+          - --target-version=py39
+        types_or:
+          - python
+          - pyi
 
   - repo: https://github.com/psf/black
     rev: 25.1.0
     hooks:
       - id: black
-        args: ["--target-version=py39"]
+        args:
+          - --target-version=py39
 
   - repo: https://github.com/pycqa/isort
     rev: 6.0.1
     hooks:
       - id: isort
-        args: ["--profile", "black", "--filter-files"]
+        args:
+          - --profile
+          - black
+          - --filter-files
 
   - repo: https://github.com/pycqa/flake8
     rev: 7.2.0
     hooks:
       - id: flake8
         language: python
         files: ^dicogis/.*\.py$
-        types: [python]
-        args: ["--config=setup.cfg", "--select=E9,F63,F7,F82"]
+        args:
+          - --config=setup.cfg
+          - --select=E9,F63,F7,F82
 
 ci:
   autofix_prs: true
diff --git a/dicogis/export/to_json.py b/dicogis/export/to_json.py
@@ -6,7 +6,6 @@
 # ########## Libraries #############
 # ##################################
 
-
 # Standard library
 import json
 import logging
diff --git a/dicogis/export/to_xlsx.py b/dicogis/export/to_xlsx.py
@@ -473,8 +473,7 @@ def store_error(
         worksheet[f"C{row_index}"].style = "Warning Text"
         # gdal info
         worksheet[f"Q{row_index}"] = (
-            f"{metadataset.processing_error_type}: "
-            f"{metadataset.processing_error_msg}"
+            f"{metadataset.processing_error_type}: {metadataset.processing_error_msg}"
         )
         worksheet[f"Q{row_index}"].style = "Warning Text"
         logger.debug(
diff --git a/dicogis/georeaders/read_vector_flat_dataset.py b/dicogis/georeaders/read_vector_flat_dataset.py
@@ -78,7 +78,6 @@ def infos_dataset(
                     dataset_type=self.dataset_type,
                 )
             elif self.dataset_type == "flat_database":
-
                 metadataset = MetaDatabaseFlat(
                     path=source_path,
                     name=source_path.stem,
diff --git a/dicogis/listing/geodata_listing.py b/dicogis/listing/geodata_listing.py
@@ -99,7 +99,6 @@ def find_geodata_files(
     li_geoj: list[str] = []
     li_geotiff: list[str] = []
     li_gxt: list[str] = []
-    li_vectors: list[str] = []
     li_dxf: list[str] = []
     li_dwg: list[str] = []
     li_dgn: list[str] = []
diff --git a/dicogis/models/metadataset.py b/dicogis/models/metadataset.py
@@ -115,7 +115,7 @@ def as_markdown_description(self) -> str:
         if self.files_dependencies:
             description += (
                 "- Related files: "
-                + f"{', '.join([str(filepath.resolve()) for filepath  in self.files_dependencies])}\n"
+                + f"{', '.join([str(filepath.resolve()) for filepath in self.files_dependencies])}\n"
             )
 
         if isinstance(self, MetaVectorDataset) and self.feature_attributes:
diff --git a/dicogis/ui/tab_database.py b/dicogis/ui/tab_database.py
@@ -12,7 +12,6 @@
 # ########## Libraries #############
 # ##################################
 
-
 # Standard library
 import logging
 from tkinter import IntVar, StringVar, Tk, Toplevel
diff --git a/dicogis/ui/tab_files.py b/dicogis/ui/tab_files.py
@@ -12,7 +12,6 @@
 # ########## Libraries #############
 # ##################################
 
-
 # Standard library
 import logging
 import threading
diff --git a/dicogis/ui/tab_settings.py b/dicogis/ui/tab_settings.py
@@ -12,7 +12,6 @@
 # ########## Libraries #############
 # ##################################
 
-
 # Standard library
 import logging
 from os import environ, getenv
diff --git a/dicogis/utils/formatters.py b/dicogis/utils/formatters.py
@@ -2,7 +2,6 @@
 
 """Helpers to format text and variables."""
 
-
 # standard library
 import logging
 from functools import lru_cache
diff --git a/dicogis/utils/journalizer.py b/dicogis/utils/journalizer.py
@@ -12,7 +12,6 @@
 # ########## Libraries #############
 # ##################################
 
-
 # Standard library
 import logging
 from getpass import getuser
@@ -131,7 +130,7 @@ def initial_logger_config(self) -> logging.Logger:
     def headers(self):
         """Log basic information before other message."""
         # initialize the log
-        logger.info(f"{'='*10} {package_name} - Version {__version__} {'='*10}")
+        logger.info(f"{'=' * 10} {package_name} - Version {__version__} {'=' * 10}")
         logger.info(f"Operating System: {opersys()}")
         logger.info(f"Architecture: {architecture()[0]}")
         logger.info(f"Computer: {gethostname()}")
diff --git a/requirements/development.txt b/requirements/development.txt
@@ -6,4 +6,5 @@ flake8-builtins>=2
 flake8-docstrings>=1.6
 flake8-eradicate>=1
 flake8-isort>=5
-pre-commit>=3,<5
+pre-commit>=4,<5
+ruff>=0.11.5,<0.12.0
diff --git a/tests/test_database_connection.py b/tests/test_database_connection.py
@@ -9,7 +9,6 @@
 # ########## Libraries #############
 # ##################################
 
-
 # Standard library
 import unittest
 from unittest.mock import MagicMock, patch
diff --git a/tests/test_dbconf_reader.py b/tests/test_dbconf_reader.py
@@ -9,7 +9,6 @@
 # ########## Libraries #############
 # ##################################
 
-
 # Standard library
 import unittest
 from pathlib import Path
diff --git a/tests/test_georeader_postgis.py b/tests/test_georeader_postgis.py
@@ -10,7 +10,6 @@
 # ########## Libraries #############
 # ##################################
 
-
 # Standard library
 import unittest
 from os import environ, unsetenv
diff --git a/tests/test_georeader_raster.py b/tests/test_georeader_raster.py
@@ -16,6 +16,7 @@
 
 # package
 from dicogis.georeaders.read_raster import ReadRasters
+from dicogis.models.metadataset import MetaRasterDataset
 
 # #############################################################################
 # ######## Globals #################
@@ -38,6 +39,7 @@ def test_read_tif_good(self):
         georeader = ReadRasters()
         for fixture_file in fixtures_files:
             metadataset = georeader.infos_dataset(fixture_file)
+            self.assertIsInstance(metadataset, MetaRasterDataset)
 
 
 # #############################################################################
diff --git a/tests/test_utils_check_path.py b/tests/test_utils_check_path.py
@@ -10,7 +10,6 @@
     python -m unittest tests.test_utils_check_path.TestUtilsCheckPath.test_check_path_as_str_ok
 """
 
-
 # standard library
 import stat
 import tempfile

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ def infos_dataset(`
`78`	`78`	`dataset_type=self.dataset_type,`
`79`	`79`	`)`
`80`	`80`	`elif self.dataset_type == "flat_database":`
`81`		`-`
`82`	`81`	`metadataset = MetaDatabaseFlat(`
`83`	`82`	`path=source_path,`
`84`	`83`	`name=source_path.stem,`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ def as_markdown_description(self) -> str:`
`115`	`115`	`if self.files_dependencies:`
`116`	`116`	`description += (`
`117`	`117`	`"- Related files: "`
`118`		`- + f"{', '.join([str(filepath.resolve()) for filepath in self.files_dependencies])}\n"`
	`118`	`+ + f"{', '.join([str(filepath.resolve()) for filepath in self.files_dependencies])}\n"`
`119`	`119`	`)`
`120`	`120`
`121`	`121`	`if isinstance(self, MetaVectorDataset) and self.feature_attributes:`