oqtopus 0.1.20__tar.gz → 0.1.22__tar.gz

{oqtopus-0.1.20 → oqtopus-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oqtopus
-Version: 0.1.20
+Version: 0.1.22
 Summary: A QGIS module manager
 Author-email: Damiano Lombardi <damiano@opengis.ch>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -346,9 +346,9 @@ License:                     GNU GENERAL PUBLIC LICENSE
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyyaml
-Requires-Dist: pgserviceparser<3.0.0,>=2.3.0
-Requires-Dist: pum<2.0.0,>=1.1.2
+Requires-Dist: pgserviceparser<3.0.0,>=2.4.0
+Requires-Dist: pum<2.0.0,>=1.1.13
+Requires-Dist: PyYAML
 Requires-Dist: pydantic>=2.0
 Requires-Dist: psycopg<4.0.0,>=3.1.0
 Requires-Dist: requests<3.0.0,>=2.31.0

{oqtopus-0.1.20 → oqtopus-0.1.22}/oqtopus/gui/main_dialog.py

@@ -53,10 +53,12 @@ DIALOG_UI = PluginUtils.get_ui_class("main_dialog.ui")
 
 class MainDialog(QDialog, DIALOG_UI):
 
-    def __init__(self, modules_config_path, parent=None):
+    def __init__(self, modules_config_path, about_dialog_cls=None, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
 
+        self.__about_dialog_cls = about_dialog_cls or AboutDialog
+
         self.buttonBox.rejected.connect(self.__closeDialog)
         self.buttonBox.helpRequested.connect(self.__helpRequested)
 
@@ -136,7 +138,7 @@ class MainDialog(QDialog, DIALOG_UI):
         dlg.exec()
 
     def __show_about_dialog(self):
-        dialog = AboutDialog(self)
+        dialog = self.__about_dialog_cls(self)
         dialog.exec()
 
     def __moduleSelection_loadingStarted(self):

{oqtopus-0.1.20 → oqtopus-0.1.22}/oqtopus/gui/project_widget.py

@@ -27,12 +27,20 @@ class ProjectWidget(QWidget, DIALOG_UI):
 
     def setModulePackage(self, module_package: ModulePackage):
         self.__current_module_package = module_package
-        self.__packagePrepareGetProjectFilename()
+        self.__updateProjectFilename()
 
     def setService(self, service):
         self.__current_service = service
+        self.__updateProjectFilename()
+
+    def __updateProjectFilename(self):
+
+        if self.__current_module_package is None:
+            self.project_info_label.setText(self.tr("No module package selected."))
+            QtUtils.setForegroundColor(self.project_info_label, PluginUtils.COLOR_WARNING)
+            QtUtils.setFontItalic(self.project_info_label, True)
+            return
 
-    def __packagePrepareGetProjectFilename(self):
         asset_project = self.__current_module_package.asset_project
         if asset_project is None:
             self.project_info_label.setText(
@@ -73,9 +81,14 @@ class ProjectWidget(QWidget, DIALOG_UI):
 
         QtUtils.resetForegroundColor(self.project_info_label)
         QtUtils.setFontItalic(self.project_info_label, False)
-        self.project_info_label.setText(
-            f"<a href='file://{asset_project.package_dir}'>{asset_project.package_dir}</a>",
-        )
+        if self.__current_service:
+            self.project_info_label.setText(
+                f"Project will use PG Service '{self.__current_service}' for database connection"
+            )
+        else:
+            self.project_info_label.setText(
+                "Project will use the default service. Please set a service in the database connection tab if you need a specific one."
+            )
 
     def __projectInstallClicked(self):
 

{oqtopus-0.1.20 → oqtopus-0.1.22}/oqtopus/utils/plugin_utils.py

@@ -95,8 +95,11 @@ class PluginUtils:
         return ini_text.value("version")
 
     @staticmethod
-    def init_logger():
-        PluginUtils.logsDirectory = f"{PluginUtils.plugin_root_path()}/logs"
+    def init_logger(logs_directory=None):
+        if logs_directory is not None:
+            PluginUtils.logsDirectory = logs_directory
+        else:
+            PluginUtils.logsDirectory = f"{PluginUtils.plugin_root_path()}/logs"
 
         directory = QDir(PluginUtils.logsDirectory)
         if not directory.exists():

{oqtopus-0.1.20 → oqtopus-0.1.22}/oqtopus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oqtopus
-Version: 0.1.20
+Version: 0.1.22
 Summary: A QGIS module manager
 Author-email: Damiano Lombardi <damiano@opengis.ch>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -346,9 +346,9 @@ License:                     GNU GENERAL PUBLIC LICENSE
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyyaml
-Requires-Dist: pgserviceparser<3.0.0,>=2.3.0
-Requires-Dist: pum<2.0.0,>=1.1.2
+Requires-Dist: pgserviceparser<3.0.0,>=2.4.0
+Requires-Dist: pum<2.0.0,>=1.1.13
+Requires-Dist: PyYAML
 Requires-Dist: pydantic>=2.0
 Requires-Dist: psycopg<4.0.0,>=3.1.0
 Requires-Dist: requests<3.0.0,>=2.31.0

{oqtopus-0.1.20 → oqtopus-0.1.22}/oqtopus.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 pyproject.toml
+requirements.txt
 oqtopus/__init__.py
 oqtopus/oqtopus.py
 oqtopus/oqtopus_plugin.py

{oqtopus-0.1.20 → oqtopus-0.1.22}/oqtopus.egg-info/requires.txt

@@ -1,6 +1,6 @@
-pyyaml
-pgserviceparser<3.0.0,>=2.3.0
-pum<2.0.0,>=1.1.2
+pgserviceparser<3.0.0,>=2.4.0
+pum<2.0.0,>=1.1.13
+PyYAML
 pydantic>=2.0
 psycopg<4.0.0,>=3.1.0
 requests<3.0.0,>=2.31.0

{oqtopus-0.1.20 → oqtopus-0.1.22}/pyproject.toml

@@ -8,21 +8,13 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "oqtopus"
 description = "A QGIS module manager"
-dynamic = ["version"]
+dynamic = ["version", "dependencies"]
 readme = "README.md"
 requires-python = ">=3.8"
 license = { file = "LICENSE" }
 authors = [
   { name="Damiano Lombardi", email="damiano@opengis.ch" }
 ]
-dependencies = [
-  "pyyaml",
-  "pgserviceparser>=2.3.0,<3.0.0",
-  "pum>=1.1.2,<2.0.0",
-  "pydantic>=2.0",
-  "psycopg>=3.1.0,<4.0.0",
-  "requests>=2.31.0,<3.0.0"
-]
 
 [tool.setuptools.packages.find]
 where = ["."]
@@ -33,3 +25,6 @@ starting_version = "0.0.1"
 
 [tool.setuptools.package-data]
 "oqtopus" = ["**/*.ui"]
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}

oqtopus-0.1.22/requirements.txt

@@ -0,0 +1,6 @@
+pgserviceparser>=2.4.0,<3.0.0
+pum>=1.1.13,<2.0.0
+PyYAML
+pydantic >=2.0
+psycopg>=3.1.0,<4.0.0
+requests>=2.31.0,<3.0.0