style

README.md

@@ -70,4 +70,4 @@ pip install modelbaker
     ├── globals.py
     ├── qgis_utils.py
     └── qt_utils.py
-```
+```

modelbaker/dataobjects/layers.py

@@ -33,7 +33,6 @@
 from qgis.PyQt.QtCore import QCoreApplication, QSettings
 
 from ..generator.config import IGNORED_FIELDNAMES
-
 from .form import Form, FormFieldWidget, FormRelationWidget, FormTab
 
 

modelbaker/dataobjects/legend.py

@@ -20,10 +20,7 @@
 
 from qgis.core import QgsLayerDefinition, QgsLayerTreeLayer, QgsProject
 
-from ..utils.qgis_utils import (
-    get_group_non_recursive,
-    get_suggested_index_for_layer,
-)
+from ..utils.qgis_utils import get_group_non_recursive, get_suggested_index_for_layer
 
 
 class LegendGroup(object):

modelbaker/db_factory/db_factory.py

@@ -19,11 +19,9 @@
 from abc import ABC, abstractmethod
 from typing import Tuple
 
-from ..iliwrapper.ili2dbconfig import Ili2DbCommandConfiguration
 from ..dataobjects.fields import Field
-from ..utils.globals import DbActionType
-
 from ..dbconnector.db_connector import DBConnector
+from ..iliwrapper.ili2dbconfig import Ili2DbCommandConfiguration
 from .db_command_config_manager import DbCommandConfigManager
 from .layer_uri import LayerUri
 

modelbaker/db_factory/db_simple_factory.py

@@ -19,7 +19,6 @@
 import logging
 
 from ..iliwrapper.globals import DbIliMode
-
 from .db_factory import DbFactory
 
 available_database_factories = dict()

modelbaker/db_factory/mssql_factory.py

@@ -17,7 +17,6 @@
  ***************************************************************************/
 """
 from ..dataobjects.fields import Field
-
 from ..dbconnector.mssql_connector import MssqlConnector
 from .db_factory import DbFactory
 from .mssql_command_config_manager import MssqlCommandConfigManager

modelbaker/dbconnector/mssql_connector.py

@@ -20,7 +20,6 @@
 import re
 
 import pyodbc
-from pyodbc import InterfaceError, ProgrammingError
 from qgis.core import Qgis
 
 from .db_connector import DBConnector, DBConnectorError

modelbaker/generator/generator.py

@@ -22,14 +22,13 @@
 from qgis.core import QgsApplication, QgsRelation, QgsWkbTypes
 from qgis.PyQt.QtCore import QCoreApplication, QLocale, QObject, pyqtSignal
 
-from ..iliwrapper.globals import DbIliMode
 from ..dataobjects.fields import Field
 from ..dataobjects.layers import Layer
 from ..dataobjects.legend import LegendGroup
 from ..dataobjects.relations import Relation
-from ..utils.qt_utils import slugify
-
 from ..db_factory.db_simple_factory import DbSimpleFactory
+from ..iliwrapper.globals import DbIliMode
+from ..utils.qt_utils import slugify
 from .config import BASKET_FIELDNAMES, IGNORED_FIELDNAMES, READONLY_FIELDNAMES
 from .domain_relations_generator import DomainRelationGenerator
 

modelbaker/iliwrapper/ili2dbutils.py

@@ -29,7 +29,6 @@
 from qgis.PyQt.QtGui import QColor
 
 from ..utils.qt_utils import NetworkError, download_file
-
 from .globals import DbIliMode
 from .ili2dbtools import get_tool_url, get_tool_version
 

modelbaker/iliwrapper/ilicache.py

@@ -30,8 +30,8 @@
 from PyQt5.QtWidgets import QGridLayout, QItemDelegate, QLabel, QStyle, QWidget
 from qgis.core import Qgis, QgsMessageLog
 
-from .ili2dbutils import get_all_modeldir_in_path
 from ..utils.qt_utils import download_file
+from .ili2dbutils import get_all_modeldir_in_path
 
 
 class IliCache(QObject):

modelbaker/iliwrapper/iliexecutable.py

@@ -23,14 +23,10 @@
 
 from qgis.PyQt.QtCore import QEventLoop, QObject, QProcess, pyqtSignal
 
+from ..utils.qt_utils import AbstractQObjectMeta
 from .ili2dbargs import get_ili2db_args
 from .ili2dbconfig import Ili2DbCommandConfiguration
-from .ili2dbutils import (
-    JavaNotFoundError,
-    get_ili2db_bin,
-    get_java_path,
-)
-from ..utils.qt_utils import AbstractQObjectMeta
+from .ili2dbutils import JavaNotFoundError, get_ili2db_bin, get_java_path
 
 
 class IliExecutable(QObject, metaclass=AbstractQObjectMeta):

modelbaker/iliwrapper/iliexporter.py

@@ -17,10 +17,7 @@
  *                                                                         *
  ***************************************************************************/
 """
-from .ili2dbconfig import (
-    ExportConfiguration,
-    Ili2DbCommandConfiguration,
-)
+from .ili2dbconfig import ExportConfiguration, Ili2DbCommandConfiguration
 from .iliexecutable import IliExecutable
 
 

modelbaker/iliwrapper/ilivalidator.py

@@ -18,20 +18,24 @@
  ***************************************************************************/
 """
 
-from .ili2dbconfig import ValidateConfiguration
-from .iliexecutable import IliExecutable
 import xml.etree.cElementTree as CET
 from enum import Enum
 
-from PyQt5.QtGui import QStandardItem, QStandardItemModel
 from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QStandardItem, QStandardItemModel
+
+from .ili2dbconfig import ValidateConfiguration
+from .iliexecutable import IliExecutable
+
+
 class Validator(IliExecutable):
     def __init__(self, parent=None):
         super(Validator, self).__init__(parent)
 
     def _create_config(self):
         return ValidateConfiguration()
 
+
 class ValidationResultModel(QStandardItemModel):
     """
     Model containing all the error/warning data of the current xtf file.
@@ -126,4 +130,4 @@ def reload(self):
                         )
                         item.setData(False, int(ValidationResultModel.Roles.FIXED))
                         self.appendRow(item)
-        self.endResetModel()
+        self.endResetModel()

modelbaker/utils/db_utils.py

@@ -19,11 +19,10 @@
 
 from qgis.core import QgsApplication, QgsAuthMethodConfig, QgsMessageLog
 
-from modelbaker.iliwrapper.globals import DbIliMode
-from modelbaker.utils.qt_utils import slugify
-
 from modelbaker.db_factory.db_simple_factory import DbSimpleFactory
 from modelbaker.dbconnector.db_connector import DBConnectorError
+from modelbaker.iliwrapper.globals import DbIliMode
+from modelbaker.utils.qt_utils import slugify
 
 
 def get_schema_identificator_from_layersource(layer_source_name, layer_source):

requirements.txt

@@ -2,4 +2,4 @@ psycopg2>=2.7.4
 pytest
 pyodbc
 future
-transifex-client
+transifex-client

setup.py

@@ -13,12 +13,12 @@
     long_description_content_type="text/markdown",
     url="https://github.com/opengisch/QgisModelBakerLibrary",
     classifiers=[
-        'Topic :: Database',
-        'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
+        "Topic :: Database",
+        "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
     python_requires=">=3.6",
     packages=setuptools.find_packages(),
-)
+)

tests/test_dataset_handling.py

@@ -29,11 +29,7 @@
 import modelbaker.utils.db_utils as db_utils
 from modelbaker.iliwrapper import iliimporter
 from modelbaker.iliwrapper.globals import DbIliMode
-from tests.utils import (
-    ilidataimporter_config,
-    iliimporter_config,
-    testdata_path,
-)
+from tests.utils import ilidataimporter_config, iliimporter_config, testdata_path
 
 start_app()
 

tests/test_domain_class_relations.py

@@ -27,17 +27,11 @@
 from qgis.testing import start_app, unittest
 
 from modelbaker.dataobjects.project import Project
-from modelbaker.db_factory.gpkg_command_config_manager import (
-    GpkgCommandConfigManager,
-)
+from modelbaker.db_factory.gpkg_command_config_manager import GpkgCommandConfigManager
 from modelbaker.generator.generator import Generator
 from modelbaker.iliwrapper import iliimporter
 from modelbaker.iliwrapper.globals import DbIliMode
-from tests.utils import (
-    get_pg_connection_string,
-    iliimporter_config,
-    testdata_path,
-)
+from tests.utils import get_pg_connection_string, iliimporter_config, testdata_path
 
 start_app()
 

tests/test_gpkg_pk.py

@@ -32,9 +32,7 @@
 from qgis.testing import start_app, unittest
 
 from modelbaker.dataobjects.project import Project
-from modelbaker.db_factory.gpkg_command_config_manager import (
-    GpkgCommandConfigManager,
-)
+from modelbaker.db_factory.gpkg_command_config_manager import GpkgCommandConfigManager
 from modelbaker.generator.generator import Generator
 from modelbaker.iliwrapper import iliimporter
 from modelbaker.iliwrapper.globals import DbIliMode

tests/test_ili2dbutils.py

@@ -1,8 +1,6 @@
 from qgis.testing import unittest
 
-from modelbaker.iliwrapper.ili2dbutils import (
-    get_all_modeldir_in_path,
-)
+from modelbaker.iliwrapper.ili2dbutils import get_all_modeldir_in_path
 from tests.utils import testdata_path
 
 

tests/test_import.py

@@ -30,16 +30,10 @@
 from qgis.testing import start_app, unittest
 
 import modelbaker.utils.db_utils as db_utils
-from modelbaker.db_factory.pg_command_config_manager import (
-    PgCommandConfigManager,
-)
+from modelbaker.db_factory.pg_command_config_manager import PgCommandConfigManager
 from modelbaker.iliwrapper import iliimporter
 from modelbaker.iliwrapper.globals import DbIliMode
-from tests.utils import (
-    ilidataimporter_config,
-    iliimporter_config,
-    testdata_path,
-)
+from tests.utils import ilidataimporter_config, iliimporter_config, testdata_path
 
 start_app()
 

tests/test_projectgen.py

@@ -33,9 +33,7 @@
 from qgis.testing import start_app, unittest
 
 from modelbaker.dataobjects.project import Project
-from modelbaker.db_factory.gpkg_command_config_manager import (
-    GpkgCommandConfigManager,
-)
+from modelbaker.db_factory.gpkg_command_config_manager import GpkgCommandConfigManager
 from modelbaker.generator.generator import Generator
 from modelbaker.iliwrapper import iliimporter
 from modelbaker.iliwrapper.globals import DbIliMode
@@ -45,11 +43,7 @@
     IliToppingFileCache,
     IliToppingFileItemModel,
 )
-from tests.utils import (
-    get_pg_connection_string,
-    iliimporter_config,
-    testdata_path,
-)
+from tests.utils import get_pg_connection_string, iliimporter_config, testdata_path
 
 CATALOGUE_DATASETNAME = "Catset"
 
@@ -2947,7 +2941,9 @@ def test_kbs_postgis_toppings(self):
             "ilidata:ch.opengis.topping.opengisch_KbS_LV95_V1_4_005",
         ]
         qml_file_model = self.get_topping_file_model(
-            importer.configuration.base_configuration, list(qml_section.values()), test_path
+            importer.configuration.base_configuration,
+            list(qml_section.values()),
+            test_path,
         )
         for layer in project.layers:
             if layer.alias:
@@ -3332,7 +3328,9 @@ def test_kbs_geopackage_toppings(self):
             "ilidata:ch.opengis.topping.opengisch_KbS_LV95_V1_4_005",
         ]
         qml_file_model = self.get_topping_file_model(
-            importer.configuration.base_configuration, list(qml_section.values()), test_path
+            importer.configuration.base_configuration,
+            list(qml_section.values()),
+            test_path,
         )
         for layer in project.layers:
             if layer.alias:
@@ -3760,8 +3758,10 @@ def load_metaconfig(self, path):
         return metaconfig
 
     # that's the same like in generate_project.py and workflow_wizard.py
-    def get_topping_file_list(self, base_config, id_list ):
-        topping_file_model = self.get_topping_file_model(base_config, id_list, test_path)
+    def get_topping_file_list(self, base_config, id_list):
+        topping_file_model = self.get_topping_file_model(
+            base_config, id_list, test_path
+        )
         file_path_list = []
 
         for file_id in id_list:
@@ -3773,7 +3773,7 @@ def get_topping_file_list(self, base_config, id_list ):
                 file_path_list.append(file_path)
         return file_path_list
 
-    def get_topping_file_model(self, base_config, id_list, tool_dir = None):
+    def get_topping_file_model(self, base_config, id_list, tool_dir=None):
         topping_file_cache = IliToppingFileCache(base_config, id_list, tool_dir)
 
         # we wait for the download or we timeout after 30 seconds and we apply what we have

tests/test_projectgen_generic_databases.py

@@ -32,11 +32,7 @@
 from modelbaker.dbconnector.db_connector import DBConnectorError
 from modelbaker.generator.generator import Generator
 from modelbaker.iliwrapper.globals import DbIliMode
-from tests.utils import (
-    get_pg_connection_string,
-    iliimporter_config,
-    testdata_path,
-)
+from tests.utils import get_pg_connection_string, iliimporter_config, testdata_path
 
 start_app()
 

tests/test_projecttopping.py

@@ -553,7 +553,9 @@ def test_kbs_postgis_ilidata(self):
 
     # that's the same like in generate_project.py and workflow_wizard.py
     def get_topping_file_list(self, base_config, id_list):
-        topping_file_model = self.get_topping_file_model(base_config, id_list, test_path)
+        topping_file_model = self.get_topping_file_model(
+            base_config, id_list, test_path
+        )
         file_path_list = []
 
         for file_id in id_list:

tests/test_update.py

@@ -10,19 +10,11 @@
 from qgis import utils
 from qgis.testing import start_app, unittest
 
-from modelbaker.db_factory.mssql_command_config_manager import (
-    MssqlCommandConfigManager,
-)
-from modelbaker.db_factory.pg_command_config_manager import (
-    PgCommandConfigManager,
-)
+from modelbaker.db_factory.mssql_command_config_manager import MssqlCommandConfigManager
+from modelbaker.db_factory.pg_command_config_manager import PgCommandConfigManager
 from modelbaker.iliwrapper import iliimporter, iliupdater
 from modelbaker.iliwrapper.globals import DbIliMode
-from tests.utils import (
-    iliimporter_config,
-    iliupdater_config,
-    testdata_path,
-)
+from tests.utils import iliimporter_config, iliupdater_config, testdata_path
 
 start_app()