Reformat black 25.1.0 (#794)

* reformated with black 25.1.0

* added precommit hook

* reformated with -l 120

Author: DanChov

.github/workflows/code_style.yml

@@ -10,4 +10,5 @@ jobs:
       - uses: psf/black@stable
         with:
           options: "--check --diff --verbose -l 120"
+          version: 25.1.0
           src: "./Mergin"

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+repos:
+  # Using this mirror lets us use mypyc-compiled black, which is about 2x faster
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.1.0
+    hooks:
+      - id: black
+        language_version: python3.10

Mergin/clone_project_dialog.py

@@ -3,7 +3,14 @@
 
 import os
 
-from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox, QFileDialog, QApplication, QMessageBox, QComboBox
+from qgis.PyQt.QtWidgets import (
+    QDialog,
+    QDialogButtonBox,
+    QFileDialog,
+    QApplication,
+    QMessageBox,
+    QComboBox,
+)
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt import uic
 

Mergin/configuration_dialog.py

@@ -108,7 +108,11 @@ def accept(self):
         set_mergin_settings(url=url, login_type=self.login_type())
 
         if self.login_type() == LoginType.PASSWORD:
-            set_mergin_auth_password(url=url, username=self.ui.username.text(), password=self.ui.password.text())
+            set_mergin_auth_password(
+                url=url,
+                username=self.ui.username.text(),
+                password=self.ui.password.text(),
+            )
         else:
             settings = QSettings()
             settings.setValue("Mergin/sso_email", self.ui.sso_email.text())

Mergin/configure_sync_wizard.py

@@ -8,7 +8,12 @@
 from qgis.PyQt.QtWidgets import QWizard, QFileDialog
 
 from qgis.gui import QgsFileWidget
-from qgis.core import QgsProject, QgsProviderRegistry, QgsApplication, QgsAuthMethodConfig
+from qgis.core import (
+    QgsProject,
+    QgsProviderRegistry,
+    QgsApplication,
+    QgsAuthMethodConfig,
+)
 
 from .utils_auth import get_stored_mergin_server_url, get_mergin_username_password
 
@@ -98,7 +103,12 @@ def __init__(self, parent=None):
         self.ledit_sync_schema.hide()
         self.populate_connections()
 
-        self.registerField("connection*", self.cmb_db_conn, "currentText", self.cmb_db_conn.currentTextChanged)
+        self.registerField(
+            "connection*",
+            self.cmb_db_conn,
+            "currentText",
+            self.cmb_db_conn.currentTextChanged,
+        )
         self.registerField("sync_schema*", self.ledit_sync_schema)
         self.registerField("internal_schema*", self.line_edit_internal_schema)
         self.cmb_db_conn.currentTextChanged.connect(self.populate_schemas)

Mergin/create_project_wizard.py

@@ -110,7 +110,11 @@ def nextId(self):
 
     def initializePage(self):
         if self.parent.init_page.cur_proj_no_pack_btn.isChecked():
-            self.setup_browsing(current_proj=True, question="Mergin Maps project folder:", field="project_dir*")
+            self.setup_browsing(
+                current_proj=True,
+                question="Mergin Maps project folder:",
+                field="project_dir*",
+            )
             self.for_current_proj = True
         else:
             self.setup_browsing(question="Create Mergin Maps project in:", field="project_dir*")
@@ -276,7 +280,9 @@ def index(self, row, column, parent):
     def toggle_item(self, idx):
         is_checked = self.data(idx, Qt.ItemDataRole.CheckStateRole) == Qt.CheckState.Checked
         self.setData(
-            idx, Qt.CheckState.Unchecked if is_checked else Qt.CheckState.Checked, Qt.ItemDataRole.CheckStateRole
+            idx,
+            Qt.CheckState.Unchecked if is_checked else Qt.CheckState.Checked,
+            Qt.ItemDataRole.CheckStateRole,
         )
 
     def map_layer(self, idx):

Mergin/data_item.py

@@ -1,4 +1,5 @@
 from math import floor
+
 try:
     import sip
 except ImportError:
@@ -58,7 +59,13 @@ def __init__(self, parent, project, project_manager, plugin):
         group_items = project_manager.get_mergin_browser_groups()
         if group_items.get("Shared with me") == parent:
             display_name = self.project_name
-        QgsDataItem.__init__(self, QgsDataItem.Collection, parent, display_name, "/Mergin/" + self.project_name)
+        QgsDataItem.__init__(
+            self,
+            QgsDataItem.Collection,
+            parent,
+            display_name,
+            "/Mergin/" + self.project_name,
+        )
         self.path = None
         self.setSortKey(f"1 {self.name()}")
         self.setIcon(QIcon(icon_path("cloud.svg")))
@@ -338,7 +345,7 @@ def __init__(
         name="Mergin Maps",
         flag=None,
         order=None,
-        plugin = None,
+        plugin=None,
     ):
         providerKey = "Mergin Maps"
         if name != providerKey:
@@ -439,7 +446,11 @@ def createChildrenGroups(self):
     def fetch_projects(self, page=1, per_page=PROJS_PER_PAGE):
         """Get paginated projects list from Mergin Maps service. If anything goes wrong, return an error item."""
         if self.project_manager is None:
-            error_item = QgsErrorItem(self, "Failed to log in. Please check the configuration", "/Mergin/error")
+            error_item = QgsErrorItem(
+                self,
+                "Failed to log in. Please check the configuration",
+                "/Mergin/error",
+            )
             sip.transferto(error_item, self)
             return [error_item]
         if self.mc.server_type() != ServerType.OLD and not self.plugin.current_workspace:
@@ -598,4 +609,4 @@ def createDataItem(self, path, parentItem):
             self.root_item = ri
             return ri
         else:
-            return None
+            return None

Mergin/diff.py

@@ -106,7 +106,13 @@ def parse_db_schema(db_file):
     for tbl in schema_json:
         columns = []
         for col in tbl["columns"]:
-            columns.append(ColumnSchema(col["name"], col["type"], "primary_key" in col and col["primary_key"]))
+            columns.append(
+                ColumnSchema(
+                    col["name"],
+                    col["type"],
+                    "primary_key" in col and col["primary_key"],
+                )
+            )
 
         tables[tbl["table"]] = TableSchema(tbl["table"], columns)
     return tables
@@ -118,7 +124,13 @@ def db_schema_from_json(schema_json):
     for tbl in schema_json:
         columns = []
         for col in tbl["columns"]:
-            columns.append(ColumnSchema(col["name"], col["type"], "primary_key" in col and col["primary_key"]))
+            columns.append(
+                ColumnSchema(
+                    col["name"],
+                    col["type"],
+                    "primary_key" in col and col["primary_key"],
+                )
+            )
 
         tables[tbl["table"]] = TableSchema(tbl["table"], columns)
     return tables
@@ -319,7 +331,10 @@ def make_local_changes_layer(mp, layer):
     diff_path = get_local_changes(geodiff, layer_path, mp)
 
     if diff_path is None:
-        return None, f"Failed to retrieve changes, as there is no base file for layer '{layer.name()}'"
+        return (
+            None,
+            f"Failed to retrieve changes, as there is no base file for layer '{layer.name()}'",
+        )
 
     db_schema = parse_db_schema(layer_path)
     diff = parse_diff(geodiff, diff_path)
@@ -489,17 +504,29 @@ def style_diff_layer(layer, schema_table):
         root_rule = QgsRuleBasedRenderer.Rule(None)
         root_rule.appendChild(
             QgsRuleBasedRenderer.Rule(
-                QgsMarkerSymbol.createSimple(point_symbol_insert), 0, 0, "_op = 'insert'", "Insert"
+                QgsMarkerSymbol.createSimple(point_symbol_insert),
+                0,
+                0,
+                "_op = 'insert'",
+                "Insert",
             )
         )
         root_rule.appendChild(
             QgsRuleBasedRenderer.Rule(
-                QgsMarkerSymbol.createSimple(point_symbol_update), 0, 0, "_op = 'update'", "Update"
+                QgsMarkerSymbol.createSimple(point_symbol_update),
+                0,
+                0,
+                "_op = 'update'",
+                "Update",
             )
         )
         root_rule.appendChild(
             QgsRuleBasedRenderer.Rule(
-                QgsMarkerSymbol.createSimple(point_symbol_delete), 0, 0, "_op = 'delete'", "Delete"
+                QgsMarkerSymbol.createSimple(point_symbol_delete),
+                0,
+                0,
+                "_op = 'delete'",
+                "Delete",
             )
         )
         r = QgsRuleBasedRenderer(root_rule)
@@ -521,13 +548,31 @@ def style_diff_layer(layer, schema_table):
 
         root_rule = QgsRuleBasedRenderer.Rule(None)
         root_rule.appendChild(
-            QgsRuleBasedRenderer.Rule(QgsLineSymbol.createSimple(line_symbol_insert), 0, 0, "_op = 'insert'", "Insert")
+            QgsRuleBasedRenderer.Rule(
+                QgsLineSymbol.createSimple(line_symbol_insert),
+                0,
+                0,
+                "_op = 'insert'",
+                "Insert",
+            )
         )
         root_rule.appendChild(
-            QgsRuleBasedRenderer.Rule(QgsLineSymbol.createSimple(line_symbol_update), 0, 0, "_op = 'update'", "Update")
+            QgsRuleBasedRenderer.Rule(
+                QgsLineSymbol.createSimple(line_symbol_update),
+                0,
+                0,
+                "_op = 'update'",
+                "Update",
+            )
         )
         root_rule.appendChild(
-            QgsRuleBasedRenderer.Rule(QgsLineSymbol.createSimple(line_symbol_delete), 0, 0, "_op = 'delete'", "Delete")
+            QgsRuleBasedRenderer.Rule(
+                QgsLineSymbol.createSimple(line_symbol_delete),
+                0,
+                0,
+                "_op = 'delete'",
+                "Delete",
+            )
         )
         r = QgsRuleBasedRenderer(root_rule)
         layer.setRenderer(r)
@@ -551,13 +596,31 @@ def style_diff_layer(layer, schema_table):
 
         root_rule = QgsRuleBasedRenderer.Rule(None)
         root_rule.appendChild(
-            QgsRuleBasedRenderer.Rule(QgsFillSymbol.createSimple(fill_symbol_insert), 0, 0, "_op = 'insert'", "Insert")
+            QgsRuleBasedRenderer.Rule(
+                QgsFillSymbol.createSimple(fill_symbol_insert),
+                0,
+                0,
+                "_op = 'insert'",
+                "Insert",
+            )
         )
         root_rule.appendChild(
-            QgsRuleBasedRenderer.Rule(QgsFillSymbol.createSimple(fill_symbol_update), 0, 0, "_op = 'update'", "Update")
+            QgsRuleBasedRenderer.Rule(
+                QgsFillSymbol.createSimple(fill_symbol_update),
+                0,
+                0,
+                "_op = 'update'",
+                "Update",
+            )
         )
         root_rule.appendChild(
-            QgsRuleBasedRenderer.Rule(QgsFillSymbol.createSimple(fill_symbol_delete), 0, 0, "_op = 'delete'", "Delete")
+            QgsRuleBasedRenderer.Rule(
+                QgsFillSymbol.createSimple(fill_symbol_delete),
+                0,
+                0,
+                "_op = 'delete'",
+                "Delete",
+            )
         )
         r = QgsRuleBasedRenderer(root_rule)
         layer.setRenderer(r)

Mergin/diff_dialog.py

@@ -17,7 +17,12 @@
     QgsApplication,
     QgsWkbTypes,
 )
-from qgis.gui import QgsGui, QgsMapToolPan, QgsAttributeTableModel, QgsAttributeTableFilterModel
+from qgis.gui import (
+    QgsGui,
+    QgsMapToolPan,
+    QgsAttributeTableModel,
+    QgsAttributeTableFilterModel,
+)
 from qgis.utils import iface, OverrideCursor
 
 from .mergin.merginproject import MerginProject
@@ -40,12 +45,17 @@ def __init__(self, parent=None):
                 self.splitter.restoreState(state)
             else:
                 height = max(
-                    [self.map_canvas.minimumSizeHint().height(), self.attribute_table.minimumSizeHint().height()]
+                    [
+                        self.map_canvas.minimumSizeHint().height(),
+                        self.attribute_table.minimumSizeHint().height(),
+                    ]
                 )
                 self.splitter.setSizes([height, height])
 
             self.toggle_layers_action = QAction(
-                QgsApplication.getThemeIcon("/mActionAddLayer.svg"), "Toggle Project Layers", self
+                QgsApplication.getThemeIcon("/mActionAddLayer.svg"),
+                "Toggle Project Layers",
+                self,
             )
             self.toggle_layers_action.setCheckable(True)
             self.toggle_layers_action.setChecked(True)
@@ -55,13 +65,17 @@ def __init__(self, parent=None):
             self.toolbar.addSeparator()
 
             self.zoom_full_action = QAction(
-                QgsApplication.getThemeIcon("/mActionZoomFullExtent.svg"), "Zoom Full", self
+                QgsApplication.getThemeIcon("/mActionZoomFullExtent.svg"),
+                "Zoom Full",
+                self,
             )
             self.zoom_full_action.triggered.connect(self.zoom_full)
             self.toolbar.addAction(self.zoom_full_action)
 
             self.zoom_selected_action = QAction(
-                QgsApplication.getThemeIcon("/mActionZoomToSelected.svg"), "Zoom To Selection", self
+                QgsApplication.getThemeIcon("/mActionZoomToSelected.svg"),
+                "Zoom To Selection",
+                self,
             )
             self.zoom_selected_action.triggered.connect(self.zoom_selected)
             self.toolbar.addAction(self.zoom_selected_action)
@@ -72,7 +86,8 @@ def __init__(self, parent=None):
             btn_add_changes.setIcon(QgsApplication.getThemeIcon("/mActionAdd.svg"))
             menu = QMenu()
             add_current_action = menu.addAction(
-                QIcon(icon_path("file-plus.svg")), "Add current changes layer to project"
+                QIcon(icon_path("file-plus.svg")),
+                "Add current changes layer to project",
             )
             add_current_action.triggered.connect(self.add_current_to_project)
             add_all_action = menu.addAction(QIcon(icon_path("folder-plus.svg")), "Add all changes layers to project")