Skip to content

Commit 7598139

Browse files
committed
Use tag names if name is empty + add libs to path
1 parent 92d5746 commit 7598139

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

oqtopus/core/module_version.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ def display_name(self):
6363
def __parse_release(self, json_payload: dict):
6464
if self.name is None:
6565
self.name = json_payload["name"]
66+
67+
if self.name is None or self.name == "":
68+
self.name = json_payload["tag_name"]
69+
6670
self.branch = self.name
6771
self.created_at = QDateTime.fromString(json_payload["created_at"], Qt.DateFormat.ISODate)
6872
self.prerelease = json_payload["prerelease"]

oqtopus/gui/main_dialog.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@
2222
#
2323
# ---------------------------------------------------------------------
2424

25+
2526
import logging
2627
import os
2728
import shutil
29+
import sys
2830

2931
import psycopg
3032
from qgis.PyQt.QtCore import Qt, QUrl
@@ -44,16 +46,21 @@
4446
from ..core.module_version import ModuleVersion
4547
from ..core.package_prepare_task import PackagePrepareTask
4648
from ..libs import pgserviceparser
47-
from ..libs.pum.pum_config import PumConfig
48-
from ..libs.pum.schema_migrations import SchemaMigrations
49-
from ..libs.pum.upgrader import Upgrader
5049
from ..utils.plugin_utils import LoggingBridge, PluginUtils, logger
5150
from ..utils.qt_utils import CriticalMessageBox, OverrideCursor, QtUtils
5251
from .about_dialog import AboutDialog
5352
from .database_create_dialog import DatabaseCreateDialog
5453
from .database_duplicate_dialog import DatabaseDuplicateDialog
5554
from .settings_dialog import SettingsDialog
5655

56+
libs_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "libs"))
57+
if libs_path not in sys.path:
58+
sys.path.insert(0, libs_path)
59+
60+
from pum.pum_config import PumConfig # noqa: E402
61+
from pum.schema_migrations import SchemaMigrations # noqa: E402
62+
from pum.upgrader import Upgrader # noqa: E402
63+
5764
DIALOG_UI = PluginUtils.get_ui_class("main_dialog.ui")
5865

5966

0 commit comments

Comments
 (0)