Fix imports

Author: domi4484

oqtopus/core/module_version.py

@@ -45,9 +45,6 @@ def __init__(
         self.download_url = (
             f"https://github.com/{organisation}/{repository}/archive/refs/{type}/{self.branch}.zip"
         )
-        # self.download_url = (
-        #     f"https://codeload.github.com/Oqtopus/wastewater/zip/refs/tags/{self.branch}"
-        # )
 
     def display_name(self):
         if self.prerelease:

oqtopus/core/package_prepare_task.py

@@ -6,7 +6,7 @@
 import requests
 from qgis.PyQt.QtCore import QFileInfo, QThread, pyqtSignal
 
-from oqtopus.utils.plugin_utils import PluginUtils
+from ..utils.plugin_utils import PluginUtils
 
 
 class PackagePrepareTask(QThread):

oqtopus/gui/database_create_dialog.py

@@ -25,8 +25,8 @@
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 
-from oqtopus.libs import pgserviceparser
-from oqtopus.utils.plugin_utils import PluginUtils
+from ..libs import pgserviceparser
+from ..utils.plugin_utils import PluginUtils
 
 DIALOG_UI = PluginUtils.get_ui_class("database_create_dialog.ui")
 

oqtopus/gui/database_duplicate_dialog.py

@@ -24,8 +24,8 @@
 
 from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 
-from oqtopus.libs import pgserviceparser
-from oqtopus.utils.plugin_utils import PluginUtils
+from ..libs import pgserviceparser
+from ..utils.plugin_utils import PluginUtils
 
 DIALOG_UI = PluginUtils.get_ui_class("database_duplicate_dialog.ui")
 

oqtopus/gui/main_dialog.py

@@ -29,15 +29,15 @@
 from qgis.PyQt.QtGui import QColor, QDesktopServices
 from qgis.PyQt.QtWidgets import QAction, QDialog, QFileDialog, QMenu, QMessageBox
 
-from oqtopus.core.package_prepare_task import PackagePrepareTask
-from oqtopus.gui.database_create_dialog import DatabaseCreateDialog
-from oqtopus.gui.database_duplicate_dialog import DatabaseDuplicateDialog
-from oqtopus.libs import pgserviceparser
-from oqtopus.libs.pum.config import PumConfig
-from oqtopus.libs.pum.schema_migrations import SchemaMigrations
-from oqtopus.libs.pum.upgrader import Upgrader
-from oqtopus.utils.plugin_utils import PluginUtils
-from oqtopus.utils.qt_utils import OverrideCursor, QtUtils
+from ..core.package_prepare_task import PackagePrepareTask
+from ..libs import pgserviceparser
+from ..libs.pum.config import PumConfig
+from ..libs.pum.schema_migrations import SchemaMigrations
+from ..libs.pum.upgrader import Upgrader
+from ..utils.plugin_utils import PluginUtils
+from ..utils.qt_utils import OverrideCursor, QtUtils
+from .database_create_dialog import DatabaseCreateDialog
+from .database_duplicate_dialog import DatabaseDuplicateDialog
 
 DIALOG_UI = PluginUtils.get_ui_class("main_dialog.ui")
 

pum-0.0.1-py3-none-any.whl

@@ -0,0 +1,2 @@
+pgserviceparser >= 2.3.0
+pum-0.0.1-py3-none-any.whl

requirements.txt

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+pip download -r requirements.txt --only-binary :all: -d temp/
+            unzip -o "temp/*.whl" -d oqtopus/libs
+            rm -r temp
+            # set write rights to group (because qgis-plugin-ci needs it)
+            chmod -R g+w oqtopus/libs